summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-08-02 22:53:46 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-08-02 22:53:46 +0200
commita4329d536ccc47c4c5e9d7ea825af02079dda5cc (patch)
treef1e158e4f88e8babbdefbd0d6acc01dc04ce983d
parente0e3b1eb786e1f7fa430fa9b8f6f8467918aacca (diff)
parent5b9b5c868b9656dab05a30e858d0554c63e7d0ed (diff)
downloadsymfony-security-a4329d536ccc47c4c5e9d7ea825af02079dda5cc.zip
symfony-security-a4329d536ccc47c4c5e9d7ea825af02079dda5cc.tar.gz
symfony-security-a4329d536ccc47c4c5e9d7ea825af02079dda5cc.tar.bz2
Merge branch '2.3'
* 2.3: moved some fixed dep versions from 2.2.* to ~2.2 (refs #8613) [HttpKernel] added a missing dep for dev [Form] fixed wrong call to setTimeZone() (closes #8644) Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4 [Form] Fixed patched forms to be valid even if children are not submitted Revert "[Form] Fix of "PATCH'ed forms are never valid"" [Form] Fixed: If a form is not present in a request, it is not automatically submitted Fixes link indices [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser Revert "[Form] Remove "value" attribute on empty_value option" [routing] added ability for apache matcher to handle array values removed dead code and fixed CS [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589)
-rw-r--r--Http/Firewall/AbstractPreAuthenticatedListener.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/Http/Firewall/AbstractPreAuthenticatedListener.php b/Http/Firewall/AbstractPreAuthenticatedListener.php
index 28f6411..e248c6d 100644
--- a/Http/Firewall/AbstractPreAuthenticatedListener.php
+++ b/Http/Firewall/AbstractPreAuthenticatedListener.php
@@ -64,6 +64,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface
list($user, $credentials) = $this->getPreAuthenticatedData($request);
} catch (BadCredentialsException $exception) {
$this->clearToken();
+
return;
}