Permalink
Browse files

[HttpFoundation] NativeSessionStorage method wrongly sets storage as …

…started
  • Loading branch information...
iambrosi authored and fabpot committed Sep 14, 2015
1 parent 68353a6 commit 8e6ef9cb5694d173ff4f0bc4038256d8e548ae45
@@ -195,6 +195,16 @@ public function setName($name)
*/
public function regenerate($destroy = false, $lifetime = null)
{
// Cannot regenerate the session ID for non-active sessions.
if (PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE !== session_status()) {
return false;
}
// Check if session ID exists in PHP 5.3
if (PHP_VERSION_ID < 50400 && '' === session_id()) {
return false;
}
if (null !== $lifetime) {
ini_set('session.cookie_lifetime', $lifetime);
}
@@ -130,6 +130,13 @@ public function testSessionGlobalIsUpToDateAfterIdRegeneration()
$this->assertEquals(42, $_SESSION['_sf2_attributes']['lucky']);
}
public function testRegenerationFailureDoesNotFlagStorageAsStarted()
{
$storage = $this->getStorage();
$this->assertFalse($storage->regenerate());
$this->assertFalse($storage->isStarted());
}
public function testDefaultSessionCacheLimiter()
{
$this->iniSet('session.cache_limiter', 'nocache');

0 comments on commit 8e6ef9c

Please sign in to comment.