summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-11-01 11:42:41 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-11-01 11:42:46 +0100
commitbcea132f940d967c0385e93002f52f172abe1b9d (patch)
treed193e3dd1ae17d56bc37cdb9eeb8e0710ac27bdf
parente8566a366e1600376b67729622e37ae7cd5fc890 (diff)
parentefa90d944170f0a2f98c482825b9809c77e7792c (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12.0
-rw-r--r--src/core/api/qwebenginecookiestore.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index abb39f07..035c9834 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -195,7 +195,8 @@ bool QWebEngineCookieStorePrivate::canAccessCookies(const QUrl &firstPartyUrl, c
if (!filterCallback)
return true;
- bool thirdParty =
+ // Empty first-party URL indicates a first-party request (see net/base/static_cookie_policy.cc)
+ bool thirdParty = !firstPartyUrl.isEmpty() &&
!net::registry_controlled_domains::SameDomainOrHost(toGurl(url),
toGurl(firstPartyUrl),
net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);