From d70d4f435ed17869cde2b0e841d701b1dc3d9802 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 15:00:36 +0200 Subject: [PATCH 1/2] apply @LukasReschke's cookie changes, hopefully finally fix #854 --- lib/user/session.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/user/session.php b/lib/user/session.php index cf93d9593af..e98fb5ee4d5 100644 --- a/lib/user/session.php +++ b/lib/user/session.php @@ -166,8 +166,8 @@ class Session implements Emitter { unset($_COOKIE["oc_username"]); //TODO: DI unset($_COOKIE["oc_token"]); unset($_COOKIE["oc_remember_login"]); - setcookie("oc_username", null, -1); - setcookie("oc_token", null, -1); - setcookie("oc_remember_login", null, -1); + setcookie('oc_username', '', time()-3600); + setcookie('oc_token', '', time()-3600); + setcookie('oc_remember_login', '', time()-3600); } } From 9e9c323acdafa0a454a6a797480ba8e0c088c6c2 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 9 Jul 2013 16:46:35 +0200 Subject: [PATCH 2/2] Set path in cookie. --- lib/user/session.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/user/session.php b/lib/user/session.php index e98fb5ee4d5..9a6c669e935 100644 --- a/lib/user/session.php +++ b/lib/user/session.php @@ -166,8 +166,8 @@ class Session implements Emitter { unset($_COOKIE["oc_username"]); //TODO: DI unset($_COOKIE["oc_token"]); unset($_COOKIE["oc_remember_login"]); - setcookie('oc_username', '', time()-3600); - setcookie('oc_token', '', time()-3600); - setcookie('oc_remember_login', '', time()-3600); + setcookie('oc_username', '', time()-3600, \OC::$WEBROOT); + setcookie('oc_token', '', time()-3600, \OC::$WEBROOT); + setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT); } }