diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-07 16:58:19 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-07 16:58:19 +0100 |
| commit | e81a736f0bd56900a300c3cb5c80568ed7b64329 (patch) | |
| tree | d48377b9ca520685fd2f1eda8f452b9abb3dd093 /Http/Session | |
| parent | 019f61c8fc68a7beb98c0f34fae3816b6904e33d (diff) | |
| parent | 73461e3f87d84dd07792abbb7acfd7c1cd99aefd (diff) | |
| download | symfony-security-e81a736f0bd56900a300c3cb5c80568ed7b64329.zip symfony-security-e81a736f0bd56900a300c3cb5c80568ed7b64329.tar.gz symfony-security-e81a736f0bd56900a300c3cb5c80568ed7b64329.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
bumped Symfony version to 2.6.4
updated VERSION for 2.6.3
updated CHANGELOG for 2.6.3
bumped Symfony version to 2.6.3
updated VERSION for 2.6.2
updated CHANGELOG for 2.6.2
bumped Symfony version to 2.5.10
updated VERSION for 2.5.9
updated CHANGELOG for 2.5.9
[FrameworkBundle] Use security.token_storage service in Controller::getUser()
bumped Symfony version to 2.3.25
updated VERSION for 2.3.24
update CONTRIBUTORS for 2.3.24
Removed unneeded version requirements
updated CHANGELOG for 2.3.24
fixed tests
[Security] Don't destroy the session on buggy php releases.
[Process] Fix input reset in WindowsPipes
add back model_timezone and view_timezone options
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Http/Session')
| -rw-r--r-- | Http/Session/SessionAuthenticationStrategy.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Http/Session/SessionAuthenticationStrategy.php b/Http/Session/SessionAuthenticationStrategy.php index dd258a0..ccfa6ba 100644 --- a/Http/Session/SessionAuthenticationStrategy.php +++ b/Http/Session/SessionAuthenticationStrategy.php @@ -47,7 +47,10 @@ class SessionAuthenticationStrategy implements SessionAuthenticationStrategyInte return; case self::MIGRATE: - $request->getSession()->migrate(true); + // Destroying the old session is broken in php 5.4.0 - 5.4.10 + // See php bug #63379 + $destroy = PHP_VERSION_ID < 50400 || PHP_VERSION_ID >= 50411; + $request->getSession()->migrate($destroy); return; |