X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=lib%2Fclasses%2Fsession%2Fmanager.php;h=c75e12bbcbaedaee5d8d814b30a9dec6cb1c9fa7;hp=4d0386ba02acd87e31402874c05d5d05e75bd97a;hb=c823bfee62931f77d5d43312f8dbc0c0a2457466;hpb=919b9dfabd69f71c088f565746c547e6e169a0b7

diff --git a/lib/classes/session/manager.php b/lib/classes/session/manager.php
index 4d0386ba02a..c75e12bbcba 100644
--- a/lib/classes/session/manager.php
+++ b/lib/classes/session/manager.php
@@ -252,7 +252,12 @@ class manager {
 
         // Set configuration.
         session_name($sessionname);
-        session_set_cookie_params(0, $CFG->sessioncookiepath, $CFG->sessioncookiedomain, $cookiesecure, $CFG->cookiehttponly);
+        // 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);
         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.