tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8736 from caffeineinc/bugfix/4.3-session-timeout-regression

Browse Source 
Existing sessions need to set a new cookie on each request, if the
This commit is contained in:
Serge Latyntsev 2019-01-18 10:30:42 +13:00 committed by GitHub
commit 4aaa419360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Control/Session.php
View File

@ -324,6 +324,12 @@ class Session
} }
session_start(); session_start();
// Session start emits a cookie, but only if there's no existing session. If there is a session timeout
// tied to this request, make sure the session is held for the entire timeout by refreshing the cookie age.
if ($timeout && $this->requestContainsSessionId($request)) {
Cookie::set(session_name(), session_id(), $timeout / 86400, $path, $domain ?: null, $secure, true);
}
} else { } else {
// If headers are sent then we can't have a session_cache_limiter otherwise we'll get a warning // If headers are sent then we can't have a session_cache_limiter otherwise we'll get a warning
session_cache_limiter(null); session_cache_limiter(null);