From 17f1295e23bbfa0d07f4de2bc81e2e41d7f60578 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 27 Oct 2016 10:00:05 +0100 Subject: [PATCH] Revert "Merge branch 'MDL-56129-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE" This reverts commit 1483afc59b45043272fc77cc3817146df677277d, reversing changes made to 9edd48f8940ed226b1fe5fba9002183e0b221d3d. --- lib/classes/session/manager.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/classes/session/manager.php b/lib/classes/session/manager.php index c75e12bbcba..4d0386ba02a 100644 --- a/lib/classes/session/manager.php +++ b/lib/classes/session/manager.php @@ -252,12 +252,7 @@ class manager { // Set configuration. session_name($sessionname); - // The session cookie expiry time cannot be extended so this needs to be set to a reasonable period, longer than - // the sessiontimeout. - // This ensures that the cookie is unlikely to timeout before the session does. - $sessionlifetime = $CFG->sessiontimeout + WEEKSECS; - session_set_cookie_params($sessionlifetime, $CFG->sessioncookiepath, $CFG->sessioncookiedomain, - $cookiesecure, $CFG->cookiehttponly); + session_set_cookie_params(0, $CFG->sessioncookiepath, $CFG->sessioncookiedomain, $cookiesecure, $CFG->cookiehttponly); ini_set('session.use_trans_sid', '0'); ini_set('session.use_only_cookies', '1'); ini_set('session.hash_function', '0'); // For now MD5 - we do not have room for sha-1 in sessions table.