aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2018-10-18 10:24:56 +0200
committerGitHub <noreply@github.com>2018-10-18 10:24:56 +0200
commit0c05ed1d3df2fdaf4dffabc697aaa2744396914c (patch)
treebc5454c82c09d8ddf662555eb1f60b757d17f74f /core
parent2634ceb35b72eac94e6bf4c61640036392c5f97f (diff)
parentd63de5471bf3c8a40bdc9f9e3b5332d2f0b1f2a9 (diff)
downloadnextcloud-server-0c05ed1d3df2fdaf4dffabc697aaa2744396914c.tar.gz
nextcloud-server-0c05ed1d3df2fdaf4dffabc697aaa2744396914c.zip
Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assets
Don't require Same Site Cookies on assets
Diffstat (limited to 'core')
-rw-r--r--core/Controller/CssController.php1
-rw-r--r--core/Controller/JsController.php1
-rw-r--r--core/Controller/SvgController.php2
3 files changed, 4 insertions, 0 deletions
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
index c8458eab29c..901074d0285 100644
--- a/core/Controller/CssController.php
+++ b/core/Controller/CssController.php
@@ -62,6 +62,7 @@ class CssController extends Controller {
/**
* @PublicPage
* @NoCSRFRequired
+ * @NoSameSiteCookieRequired
*
* @param string $fileName css filename with extension
* @param string $appName css folder name
diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php
index f91fe8f75d5..cdf22eda5fa 100644
--- a/core/Controller/JsController.php
+++ b/core/Controller/JsController.php
@@ -56,6 +56,7 @@ class JsController extends Controller {
/**
* @PublicPage
* @NoCSRFRequired
+ * @NoSameSiteCookieRequired
*
* @param string $fileName js filename with extension
* @param string $appName js folder name
diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
index c6bf7b94da3..f7159dd9fe1 100644
--- a/core/Controller/SvgController.php
+++ b/core/Controller/SvgController.php
@@ -57,6 +57,7 @@ class SvgController extends Controller {
/**
* @PublicPage
* @NoCSRFRequired
+ * @NoSameSiteCookieRequired
*
* Generate svg from filename with the requested color
*
@@ -73,6 +74,7 @@ class SvgController extends Controller {
/**
* @PublicPage
* @NoCSRFRequired
+ * @NoSameSiteCookieRequired
*
* Generate svg from filename with the requested color
*