Changeset 181688 in webkit

Timestamp:

Mar 18, 2015, 12:26:27 AM (11 years ago)

Author:

Chris Dumez

Message:

[WK2] We should not even try the network cache for non-HTTP protocol requests
​https://bugs.webkit.org/show_bug.cgi?id=142802
<rdar://problem/19632130>

Reviewed by Antti Koivisto.

We should not even try the network cache for non-HTTP protocol requests
and the network cache cannot handle those.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::start):

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::canRetrieve):
(WebKit::NetworkCache::Cache::retrieve):

• NetworkProcess/cache/NetworkCache.h:
• NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm:

(WebKit::NetworkCache::retrieveDecisionToDiagnosticKey):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.cpp (modified) (2 diffs)
• NetworkProcess/cache/NetworkCache.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-18  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] We should not even try the network cache for non-HTTP protocol requests
+        https://bugs.webkit.org/show_bug.cgi?id=142802
+        <rdar://problem/19632130>
+
+        Reviewed by Antti Koivisto.
+
+        We should not even try the network cache for non-HTTP protocol requests
+        and the network cache cannot handle those.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::start):
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::canRetrieve):
+        (WebKit::NetworkCache::Cache::retrieve):
+        * NetworkProcess/cache/NetworkCache.h:
+        * NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm:
+        (WebKit::NetworkCache::retrieveDecisionToDiagnosticKey):
+
 2015-03-17  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -136 +136 @@
 
 #if ENABLE(NETWORK_CACHE)
-    if (!NetworkCache::singleton().isEnabled() || sessionID().isEphemeral()) {
+    if (!NetworkCache::singleton().isEnabled() || sessionID().isEphemeral() || !originalRequest().url().protocolIsInHTTPFamily()) {
         startNetworkLoad();
         return;

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

@@ -245 +245 @@
 static RetrieveDecision canRetrieve(const WebCore::ResourceRequest& request)
 {
-    if (!request.url().protocolIsInHTTPFamily())
-        return RetrieveDecision::NoDueToProtocol;
     // FIXME: Support HEAD and OPTIONS requests.
     if (request.httpMethod() != "GET")
@@ -262 +260 @@
 {
     ASSERT(isEnabled());
+    ASSERT(originalRequest.url().protocolIsInHTTPFamily());
 
     LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h

@@ -67 +67 @@
 enum class RetrieveDecision {
     Yes,
-    NoDueToProtocol,
     NoDueToHTTPMethod,
     NoDueToConditionalRequest,

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm

@@ -191 +191 @@
 {
     switch (retrieveDecision) {
-    case RetrieveDecision::NoDueToProtocol:
-        return WebCore::DiagnosticLoggingKeys::notHTTPFamilyKey();
     case RetrieveDecision::NoDueToHTTPMethod:
         return WebCore::DiagnosticLoggingKeys::unsupportedHTTPMethodKey();