Title: [267694] releases/WebKitGTK/webkit-2.30/Source
- Revision
- 267694
- Author
- [email protected]
- Date
- 2020-09-28 01:18:19 -0700 (Mon, 28 Sep 2020)
Log Message
Merge r267621 - [SOUP] Do not set site for cookies twice in case of redirection
https://bugs.webkit.org/show_bug.cgi?id=217010
Reviewed by Michael Catanzaro.
Source/WebCore:
Only set is-toplevel-navigation on SoupMessage when same site info is present.
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageMembers const):
Source/WebKit:
ResourceRequest::updateSoupMessage() already fills the same site information, but we are duplicating the code in
NetworkDataTaskSoup::continueHTTPRedirection().
* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::continueHTTPRedirection): Do not set same site information here, it will be done
again in NetworkDataTaskSoup::createRequest().
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (267693 => 267694)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-09-28 08:18:13 UTC (rev 267693)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-09-28 08:18:19 UTC (rev 267694)
@@ -1,5 +1,17 @@
2020-09-26 Carlos Garcia Campos <[email protected]>
+ [SOUP] Do not set site for cookies twice in case of redirection
+ https://bugs.webkit.org/show_bug.cgi?id=217010
+
+ Reviewed by Michael Catanzaro.
+
+ Only set is-toplevel-navigation on SoupMessage when same site info is present.
+
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupMessageMembers const):
+
+2020-09-26 Carlos Garcia Campos <[email protected]>
+
[SOUP] Slack.com is not working, new messages do not load due to WebSocket authentication failure issue
https://bugs.webkit.org/show_bug.cgi?id=149551
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (267693 => 267694)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2020-09-28 08:18:13 UTC (rev 267693)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2020-09-28 08:18:19 UTC (rev 267694)
@@ -112,12 +112,13 @@
soup_message_set_first_party(soupMessage, firstParty.get());
#if SOUP_CHECK_VERSION(2, 69, 90)
- if (m_sameSiteDisposition == ResourceRequest::SameSiteDisposition::SameSite) {
- GUniquePtr<SoupURI> siteForCookies = urlToSoupURI(m_url);
- soup_message_set_site_for_cookies(soupMessage, siteForCookies.get());
+ if (!isSameSiteUnspecified()) {
+ if (isSameSite()) {
+ GUniquePtr<SoupURI> siteForCookies = urlToSoupURI(m_url);
+ soup_message_set_site_for_cookies(soupMessage, siteForCookies.get());
+ }
+ soup_message_set_is_top_level_navigation(soupMessage, isTopSite());
}
-
- soup_message_set_is_top_level_navigation(soupMessage, isTopSite());
#endif
soup_message_set_flags(soupMessage, m_soupFlags);
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (267693 => 267694)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2020-09-28 08:18:13 UTC (rev 267693)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2020-09-28 08:18:19 UTC (rev 267694)
@@ -1,3 +1,17 @@
+2020-09-26 Carlos Garcia Campos <[email protected]>
+
+ [SOUP] Do not set site for cookies twice in case of redirection
+ https://bugs.webkit.org/show_bug.cgi?id=217010
+
+ Reviewed by Michael Catanzaro.
+
+ ResourceRequest::updateSoupMessage() already fills the same site information, but we are duplicating the code in
+ NetworkDataTaskSoup::continueHTTPRedirection().
+
+ * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+ (WebKit::NetworkDataTaskSoup::continueHTTPRedirection): Do not set same site information here, it will be done
+ again in NetworkDataTaskSoup::createRequest().
+
2020-09-21 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.30.1 release
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (267693 => 267694)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2020-09-28 08:18:13 UTC (rev 267693)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2020-09-28 08:18:19 UTC (rev 267694)
@@ -695,20 +695,9 @@
m_lastHTTPMethod = request.httpMethod();
request.removeCredentials();
- if (isTopLevelNavigation()) {
+ if (isTopLevelNavigation())
request.setFirstPartyForCookies(request.url());
-#if SOUP_CHECK_VERSION(2, 69, 90)
- soup_message_set_is_top_level_navigation(m_soupMessage.get(), true);
-#endif
- }
-#if SOUP_CHECK_VERSION(2, 69, 90)
- if (request.isSameSite()) {
- GUniquePtr<SoupURI> requestURI = urlToSoupURI(request.url());
- soup_message_set_site_for_cookies(m_soupMessage.get(), requestURI.get());
- }
-#endif
-
if (isCrossOrigin) {
// The network layer might carry over some headers from the original request that
// we want to strip here because the redirect is cross-origin.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
