aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-10-24 15:38:27 +0200
committerGitHub <noreply@github.com>2018-10-24 15:38:27 +0200
commit751aa9968235bac4581c9218679557c842c68eea (patch)
tree285a23fcb5a4a4f5df32f316320ea04a6cab64c9
parente5814bd948f09eab95134bb44f226947d34e0b63 (diff)
parentbae42072468420d690d42f676f7f06be7e30a52f (diff)
downloadnextcloud-server-751aa9968235bac4581c9218679557c842c68eea.tar.gz
nextcloud-server-751aa9968235bac4581c9218679557c842c68eea.zip
Merge pull request #12005 from iPaat/Backport14/Fix11847
[stable14] Remove cookies from Clear-Site-Data Header
-rw-r--r--core/Controller/LoginController.php2
-rw-r--r--tests/Core/Controller/LoginControllerTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 09b6fe54384..182d2bc106d 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -131,7 +131,7 @@ class LoginController extends Controller {
$this->userSession->logout();
$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
- $response->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ $response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
return $response;
}
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index f3e6c854808..f2e8d112b64 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -117,7 +117,7 @@ class LoginControllerTest extends TestCase {
->willReturn('/login');
$expected = new RedirectResponse('/login');
- $expected->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ $expected->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
$this->assertEquals($expected, $this->loginController->logout());
}
@@ -147,7 +147,7 @@ class LoginControllerTest extends TestCase {
->willReturn('/login');
$expected = new RedirectResponse('/login');
- $expected->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ $expected->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
$this->assertEquals($expected, $this->loginController->logout());
}