diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-11 08:12:14 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-11 08:12:14 +0100 |
commit | a8d995fac4ccf99e34db97ea252cc993382ac83e (patch) | |
tree | a7a24f3e3e488d0d7bb6c5656e20ee35dd7056f1 /Http/Firewall | |
parent | 3ab3e7fe1a03c043d03d6bac5666e9cbb51caa16 (diff) | |
parent | 41890dcab00f2e1de2080472bd9d57e242e3db76 (diff) | |
download | symfony-security-a8d995fac4ccf99e34db97ea252cc993382ac83e.zip symfony-security-a8d995fac4ccf99e34db97ea252cc993382ac83e.tar.gz symfony-security-a8d995fac4ccf99e34db97ea252cc993382ac83e.tar.bz2 |
Merge branch '2.3' into 2.6
* 2.3:
[FrameworkBundle] Fix title and placeholder rendering in php form templates.
RequestDataCollector - small fix
renamed composer.phar to composer to be consistent with the Symfony docs
[FrameworkBundle] bumped min version of Routing to 2.3
removed composer --dev option everywhere
fixed a test
[Console] Fixed output bug, if escaped string in a formatted string.
[Security] Remove ContextListener's onKernelResponse listener as it is used
Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
Revert "fixed assertion"
fixed assertion
[HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
fixed URL
Add reference to documentation in FormEvents phpdocs
[YAML] Fix one-liners to work with multiple new lines
Keep "pre" meaning for var_dump quick-and-dirty debug
[Console][Table] Fix cell padding with multi-byte
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/Console/Helper/TableHelper.php
Diffstat (limited to 'Http/Firewall')
-rw-r--r-- | Http/Firewall/ContextListener.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php index f703c9c..732bbf7 100644 --- a/Http/Firewall/ContextListener.php +++ b/Http/Firewall/ContextListener.php @@ -113,6 +113,9 @@ class ContextListener implements ListenerInterface return; } + $this->dispatcher->removeListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse')); + $this->registered = false; + if (null !== $this->logger) { $this->logger->debug('Write SecurityContext in the session'); } |