summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorAdrien Samson <adrien@kyklydse.com>2013-02-07 21:06:50 +0100
committerAdrien Samson <adrien@kyklydse.com>2013-02-07 21:22:30 +0100
commit49342d68ed1dd7eec52d30cf40280996dca6873d (patch)
tree6b92e6d7c9f1c6270a5aed7d27a4c5933c341182 /Http
parent1c556ad72cfb835726456d1ef63664a105b9ddf2 (diff)
downloadsymfony-security-49342d68ed1dd7eec52d30cf40280996dca6873d.zip
symfony-security-49342d68ed1dd7eec52d30cf40280996dca6873d.tar.gz
symfony-security-49342d68ed1dd7eec52d30cf40280996dca6873d.tar.bz2
[Security] fixed session creation on login (closes #7011)
Diffstat (limited to 'Http')
-rw-r--r--Http/Firewall/ContextListener.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index b3f80b5..c24c879 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -117,14 +117,16 @@ class ContextListener implements ListenerInterface
}
$request = $event->getRequest();
- $session = $request->hasPreviousSession() ? $request->getSession() : null;
+ $session = $request->getSession();
if (null === $session) {
return;
}
if ((null === $token = $this->context->getToken()) || ($token instanceof AnonymousToken)) {
- $session->remove('_security_'.$this->contextKey);
+ if ($request->hasPreviousSession()) {
+ $session->remove('_security_'.$this->contextKey);
+ }
} else {
$session->set('_security_'.$this->contextKey, serialize($token));
}