summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-04-17 07:31:37 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-04-17 07:31:37 +0200
commit56ddd41a7e9dce580ae6b6ef10350f9663b34d4b (patch)
treeda00aa1de3c44aae37bef7b5e08731cb74a487e4
parent29d6516841ca9961398dee9479bc576d9b09d6dd (diff)
parent80e9159c0c5cc108d799b7b80099565c62e3201f (diff)
downloadsymfony-security-56ddd41a7e9dce580ae6b6ef10350f9663b34d4b.zip
symfony-security-56ddd41a7e9dce580ae6b6ef10350f9663b34d4b.tar.gz
symfony-security-56ddd41a7e9dce580ae6b6ef10350f9663b34d4b.tar.bz2
Merge branch '2.2'
* 2.2: Fix default value handling for multi-value options [HttpKernel] truncate profiler token to 6 chars (see #7665) Disabled APC on Travis for PHP 5.5+ as it is not available [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path Fix download over SSL using IE < 8 and binary file response [Console] Fix merging of application definition, fixes #7068, replaces #7158 [HttpKernel] fixed the Kernel when the ClassLoader component is not available (closes #7406) fixed output of bag values [Yaml] improved boolean naming ($notEOF -> !$EOF) [Yaml] fixed handling an empty value [Routing][XML Loader] Add a possibility to set a default value to null [Console] fixed handling of "0" input on ask The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback() fixed handling of "0" input on ask [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation Update PhpEngine.php [PropertyAccess] Add objectives to pluralMap [Security] Removed unused var [HttpFoundation] getClientIp is fixed. Conflicts: src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpKernel/Kernel.php
-rw-r--r--Http/Firewall.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall.php b/Http/Firewall.php
index e083fdb..31c1da5 100644
--- a/Http/Firewall.php
+++ b/Http/Firewall.php
@@ -63,7 +63,7 @@ class Firewall implements EventSubscriberInterface
// initiate the listener chain
foreach ($listeners as $listener) {
- $response = $listener->handle($event);
+ $listener->handle($event);
if ($event->hasResponse()) {
break;