diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-14 12:14:46 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-14 12:14:46 +0200 |
| commit | 341b733dec40aacf7ecbc66b2ca0381c3a119a24 (patch) | |
| tree | 612086e5459308631d8b98966705c64a45631ed9 | |
| parent | 04db96adaf9faff80aaf26c181215d9986c97263 (diff) | |
| parent | 3adbfbfd694d09b165be41df108480ea16bb4d29 (diff) | |
| download | nextcloud-server-341b733dec40aacf7ecbc66b2ca0381c3a119a24.tar.gz nextcloud-server-341b733dec40aacf7ecbc66b2ca0381c3a119a24.zip | |
Merge pull request #19010 from owncloud/use-proper-web-root
Use / instead of an empty string as cookie path
| -rw-r--r-- | lib/private/session/cryptowrapper.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php index 62bdcbfb719..261514d683e 100644 --- a/lib/private/session/cryptowrapper.php +++ b/lib/private/session/cryptowrapper.php @@ -77,7 +77,11 @@ class CryptoWrapper { $secureCookie = $request->getServerProtocol() === 'https'; // FIXME: Required for CI if (!defined('PHPUNIT_RUN')) { - setcookie(self::COOKIE_NAME, $this->passphrase, 0, \OC::$WEBROOT, '', $secureCookie, true); + $webRoot = \OC::$WEBROOT; + if($webRoot === '') { + $webRoot = '/'; + } + setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true); } } } |