Changeset 247276 in webkit

Timestamp:

Jul 9, 2019 1:44:07 PM (5 years ago)

Author:

youenn@apple.com

Message:

XHR CORS requests logged twice in the server
​https://bugs.webkit.org/show_bug.cgi?id=199492
<rdar://problem/52757558>

Reviewed by Chris Dumez.

Source/WebKit:

Disable speculative loading for XHR and fetch.
These speculative requests might have specific headers that are no longer relevant
when reloading the page. This might then confuse servers.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::makeStoreDecision):
(WebKit::NetworkCache::canRequestUseSpeculativeRevalidation):
(WebKit::NetworkCache::Cache::retrieve):

LayoutTests:

• http/wpt/fetch/disable-speculative-load-for-xhr-and-fetch-loads-expected.txt: Added.
• http/wpt/fetch/disable-speculative-load-for-xhr-and-fetch-loads.html: Added.
• http/wpt/fetch/resources/fetch-xhr-load.py: Added.

(main):

• http/wpt/fetch/resources/xhr-and-fetch.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/fetch/disable-speculative-load-for-xhr-and-fetch-loads-expected.txt (added)
• LayoutTests/http/wpt/fetch/disable-speculative-load-for-xhr-and-fetch-loads.html (added)
• LayoutTests/http/wpt/fetch/resources/fetch-xhr-load.py (added)
• LayoutTests/http/wpt/fetch/resources/xhr-and-fetch.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-09  Youenn Fablet  <youenn@apple.com>
+
+        XHR CORS requests logged twice in the server
+        https://bugs.webkit.org/show_bug.cgi?id=199492
+        <rdar://problem/52757558>
+
+        Reviewed by Chris Dumez.
+
+        * http/wpt/fetch/disable-speculative-load-for-xhr-and-fetch-loads-expected.txt: Added.
+        * http/wpt/fetch/disable-speculative-load-for-xhr-and-fetch-loads.html: Added.
+        * http/wpt/fetch/resources/fetch-xhr-load.py: Added.
+        (main):
+        * http/wpt/fetch/resources/xhr-and-fetch.html: Added.
+
 2019-07-09  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-09  Youenn Fablet  <youenn@apple.com>
+
+        XHR CORS requests logged twice in the server
+        https://bugs.webkit.org/show_bug.cgi?id=199492
+        <rdar://problem/52757558>
+
+        Reviewed by Chris Dumez.
+
+        Disable speculative loading for XHR and fetch.
+        These speculative requests might have specific headers that are no longer relevant
+        when reloading the page. This might then confuse servers.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::makeStoreDecision):
+        (WebKit::NetworkCache::canRequestUseSpeculativeRevalidation):
+        (WebKit::NetworkCache::Cache::retrieve):
+
 2019-07-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp

@@ -270 +270 @@
 }
 
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+static bool inline canRequestUseSpeculativeRevalidation(const ResourceRequest& request)
+{
+    if (request.isConditional())
+        return false;
+
+    if (cachePolicyAllowsExpired(request.cachePolicy()))
+        return false;
+
+    return request.requester() != ResourceRequest::Requester::XHR && request.requester() != ResourceRequest::Requester::Fetch;
+}
+#endif
+
 void Cache::retrieve(const WebCore::ResourceRequest& request, const GlobalFrameID& frameID, RetrieveCompletionHandler&& completionHandler)
 {
@@ -284 +297 @@
 
 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-    bool canUseSpeculativeRevalidation = m_speculativeLoadManager && !request.isConditional() && !cachePolicyAllowsExpired(request.cachePolicy());
+    bool canUseSpeculativeRevalidation = m_speculativeLoadManager && canRequestUseSpeculativeRevalidation(request);
     if (canUseSpeculativeRevalidation)
         m_speculativeLoadManager->registerLoad(frameID, request, storageKey);