diff --git a/lib/base.php b/lib/base.php index 628756cd217c7c7350758382b35cfea6ecf38f4c..23b9adde86a9b7bc60275cc20a7e75abed9742e6 100644 --- a/lib/base.php +++ b/lib/base.php @@ -441,7 +441,7 @@ class OC { // session timeout if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) { if (isset($_COOKIE[session_name()])) { - setcookie(session_name(), null, -1, self::$WEBROOT ? : '/'); + setcookie(session_name(), '', -1, self::$WEBROOT ? : '/'); } \OC::$server->getUserSession()->logout(); } diff --git a/lib/private/Session/Internal.php b/lib/private/Session/Internal.php index 182754f457cd2dcb3cd1cf118996acf0f52216a3..6d09a2fab1b055fd36488fa44d923f95df29030f 100644 --- a/lib/private/Session/Internal.php +++ b/lib/private/Session/Internal.php @@ -54,7 +54,7 @@ class Internal extends Session { try { $this->invoke('session_start'); } catch (\Exception $e) { - setcookie($this->invoke('session_name'), null, -1, \OC::$WEBROOT ?: '/'); + setcookie($this->invoke('session_name'), '', -1, \OC::$WEBROOT ?: '/'); } restore_error_handler(); if (!isset($_SESSION)) {