Changeset 180148 in webkit

Timestamp:

Feb 16, 2015 9:16:16 AM (9 years ago)

Author:

Antti Koivisto

Message:

Assertion in disk cache code with redirect to a non-http resource
​https://bugs.webkit.org/show_bug.cgi?id=141644

Reviewed by Anders Carlsson.

Source/WebKit2:

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didFinishLoading):

Check that response is HTTP before calling computeFreshnessLifetimeForHTTPFamily.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::canStore):

Deny storing non-HTTP responses to cache (though the above already covers this).

LayoutTests:

• http/tests/cache/disk-cache-redirect-to-data-expected.txt: Added.
• http/tests/cache/disk-cache-redirect-to-data.html: Added.
• http/tests/cache/resources/redirect-to-data.php: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/disk-cache-redirect-to-data-expected.txt (added)
• LayoutTests/http/tests/cache/disk-cache-redirect-to-data.html (added)
• LayoutTests/http/tests/cache/resources/redirect-to-data.php (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-16  Antti Koivisto  <antti@apple.com>
+
+        Assertion in disk cache code with redirect to a non-http resource
+        https://bugs.webkit.org/show_bug.cgi?id=141644
+
+        Reviewed by Anders Carlsson.
+
+        * http/tests/cache/disk-cache-redirect-to-data-expected.txt: Added.
+        * http/tests/cache/disk-cache-redirect-to-data.html: Added.
+        * http/tests/cache/resources/redirect-to-data.php: Added.
+
 2015-02-16  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-16  Antti Koivisto  <antti@apple.com>
+
+        Assertion in disk cache code with redirect to a non-http resource
+        https://bugs.webkit.org/show_bug.cgi?id=141644
+
+        Reviewed by Anders Carlsson.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didFinishLoading):
+
+            Check that response is HTTP before calling computeFreshnessLifetimeForHTTPFamily.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::canStore):
+
+            Deny storing non-HTTP responses to cache (though the above already covers this).
+
 2015-02-13  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -328 +328 @@
         }
         bool allowStale = originalRequest().cachePolicy() >= ReturnCacheDataElseLoad;
-        bool hasCacheableRedirect = WebCore::redirectChainAllowsReuse(m_redirectChainCacheStatus, allowStale ? WebCore::ReuseExpiredRedirection : WebCore::DoNotReuseExpiredRedirection);
+        bool hasCacheableRedirect = m_response.isHTTP() && WebCore::redirectChainAllowsReuse(m_redirectChainCacheStatus, allowStale ? WebCore::ReuseExpiredRedirection : WebCore::DoNotReuseExpiredRedirection);
         if (hasCacheableRedirect && m_redirectChainCacheStatus.status == RedirectChainCacheStatus::CachedRedirection) {
             // FIXME: Cache the actual redirects instead of the end result.

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

@@ -263 +263 @@
 static bool canStore(const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceResponse& response)
 {
-    if (!originalRequest.url().protocolIsInHTTPFamily()) {
+    if (!originalRequest.url().protocolIsInHTTPFamily() || !response.isHTTP()) {
         LOG(NetworkCache, "(NetworkProcess) not HTTP");
         return false;