From e4876c91176473c19e8c24d8fcb6e338cffa0123 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 18 Apr 2013 21:11:55 +0200
Subject: [PATCH] Don't use empty session.cookie_path, otherwise we get
 multiple cookies

---
 lib/base.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index dde994a7e57..50dd9a29123 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -324,7 +324,8 @@ class OC {
 		ini_set('session.cookie_httponly', '1;');
 
 		// set the cookie path to the ownCloud directory
-		ini_set('session.cookie_path', OC::$WEBROOT);
+		$cookie_path = OC::$WEBROOT ?: '/';
+		ini_set('session.cookie_path', $cookie_path);
 
 		// set the session name to the instance id - which is unique
 		session_name(OC_Util::getInstanceId());
@@ -357,7 +358,7 @@ class OC {
 		// session timeout
 		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) {
 			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), '', time() - 42000, OC::$WEBROOT);
+				setcookie(session_name(), '', time() - 42000, $cookie_path);
 			}
 			session_unset();
 			session_destroy();
-- 
2.39.5