diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-09-07 19:31:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 19:31:30 +0200 |
| commit | c44368b9a391274b1c3a0b751ceffc764d703c77 (patch) | |
| tree | ab35d72c1cf4f4affcc439314a427914511df746 | |
| parent | a3e86be8c7a22990f66be651e1198b611a36c34b (diff) | |
| parent | fe21b10de59edfd95bd50f5b3c65e444cd717788 (diff) | |
| download | nextcloud-server-c44368b9a391274b1c3a0b751ceffc764d703c77.tar.gz nextcloud-server-c44368b9a391274b1c3a0b751ceffc764d703c77.zip | |
Merge pull request #11096 from nextcloud/bugfix/11080/set-cookie-null-argument
replace setcookie value with '' instead of null.
| -rw-r--r-- | lib/base.php | 2 | ||||
| -rw-r--r-- | lib/private/Session/Internal.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 628756cd217..23b9adde86a 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 182754f457c..6d09a2fab1b 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)) { |