summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-10 18:14:38 +0100
committerGitHub <noreply@github.com>2017-03-10 18:14:38 +0100
commitf74911b6385991a69864dbae78091f2cb502d39e (patch)
tree68a33d39d78daaf5b6feac982b42262f178dcb38 /lib
parent1045bf4a2bd6777cfc6ee818f562db7145eae70a (diff)
parent9a8cef965f607fb8b73234fabcc5f47252e893cc (diff)
downloadnextcloud-server-f74911b6385991a69864dbae78091f2cb502d39e.tar.gz
nextcloud-server-f74911b6385991a69864dbae78091f2cb502d39e.zip
Merge pull request #3787 from nextcloud/ocs-cookie
dont require strict same site cookies for ocs requests
Diffstat (limited to 'lib')
-rw-r--r--lib/private/AppFramework/Http/Request.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index be35f4d172f..fd43d468568 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -490,6 +490,9 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @return bool
*/
private function cookieCheckRequired() {
+ if ($this->getHeader('OCS-APIREQUEST')) {
+ return false;
+ }
if($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) {
return false;
}