From 5bf16ed0568e3d31daed1e46742a0c34f55382f5 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Tue, 12 Aug 2014 14:49:50 +0200 Subject: [PATCH] Not setting the cookie timeout, it is better if the user can control this setting Fixes #4239 --- src/Network/Session.php | 1 - tests/TestCase/Network/SessionTest.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Network/Session.php b/src/Network/Session.php index 1ba0e05d9dc..96070b057e5 100644 --- a/src/Network/Session.php +++ b/src/Network/Session.php @@ -191,7 +191,6 @@ protected static function _defaultConfig($name) { */ public function __construct(array $config = []) { if (isset($config['timeout'])) { - $config['ini']['session.cookie_lifetime'] = 60 * $config['timeout']; $config['ini']['session.gc_maxlifetime'] = 60 * $config['timeout']; } diff --git a/tests/TestCase/Network/SessionTest.php b/tests/TestCase/Network/SessionTest.php index 2091bf0d778..6c030302d2c 100644 --- a/tests/TestCase/Network/SessionTest.php +++ b/tests/TestCase/Network/SessionTest.php @@ -439,7 +439,7 @@ public function testCookieTimeoutFallback() { ]; new Session($config); - $this->assertEquals(400 * 60, ini_get('session.cookie_lifetime')); + $this->assertEquals(0, ini_get('session.cookie_lifetime')); $this->assertEquals(400 * 60, ini_get('session.gc_maxlifetime')); }