mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11096 from nextcloud/bugfix/11080/set-cookie-null-argument 

replace setcookie value with '' instead of null.
This commit is contained in:
Roeland Jago Douma 2018-09-07 19:31:30 +02:00 committed by GitHub
parent a3e86be8c7 fe21b10de5
commit c44368b9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base.php
View File

@ -441,7 +441,7 @@ class OC {
// session timeout // session timeout
if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) { if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
if (isset($_COOKIE[session_name()])) { if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), null, -1, self::$WEBROOT ? : '/'); setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
} }
\OC::$server->getUserSession()->logout(); \OC::$server->getUserSession()->logout();
} }

2
lib/private/Session/Internal.php
View File

@ -54,7 +54,7 @@ class Internal extends Session {
try { try {
$this->invoke('session_start'); $this->invoke('session_start');
} catch (\Exception $e) { } catch (\Exception $e) {
setcookie($this->invoke('session_name'), null, -1, \OC::$WEBROOT ?: '/'); setcookie($this->invoke('session_name'), '', -1, \OC::$WEBROOT ?: '/');
} }
restore_error_handler(); restore_error_handler();
if (!isset($_SESSION)) { if (!isset($_SESSION)) {