Changeset 200849 in webkit

Timestamp:

May 13, 2016, 5:59:02 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r200326 - Do not reuse cache entries with conditional headers
​https://bugs.webkit.org/show_bug.cgi?id=157205
rdar://problem/25856933

Reviewed by Chris Dumez.

Source/WebCore:

Test: http/tests/xmlhttprequest/if-modified-since-0.html

• loader/cache/CachedRawResource.cpp:

(WebCore::CachedRawResource::canReuse):
CachedResourceLoader::determineRevalidationPolicy asserts that the request is not conditional,
which means that it does not have any headers like If-Modified-Since. They are usually different,
because we put the timestamp in the If-Modified-Since header, so it fails the canReuse test because
time has passed since the last If-Modified-Since header was sent. When a user sets the If-Modified-Since
manually to something that is constant, we reuse cache entries when we should not.

• platform/network/mac/WebCoreResourceHandleAsDelegate.mm:

(-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
Set the source so we can use it in Internals.

LayoutTests:

• http/tests/xmlhttprequest/if-modified-since-0-expected.txt: Added.
• http/tests/xmlhttprequest/if-modified-since-0.html: Added.

Location:

releases/WebKitGTK/webkit-2.12

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/if-modified-since-0-expected.txt (added)
• LayoutTests/http/tests/xmlhttprequest/if-modified-since-0.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedRawResource.cpp (modified) (1 diff)
• Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (modified) (2 diffs)

releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-29  Alex Christensen  <achristensen@webkit.org>
+
+        Do not reuse cache entries with conditional headers
+        https://bugs.webkit.org/show_bug.cgi?id=157205
+        rdar://problem/25856933
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/xmlhttprequest/if-modified-since-0-expected.txt: Added.
+        * http/tests/xmlhttprequest/if-modified-since-0.html: Added.
+
 2016-04-30  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-29  Alex Christensen  <achristensen@webkit.org>
+
+        Do not reuse cache entries with conditional headers
+        https://bugs.webkit.org/show_bug.cgi?id=157205
+        rdar://problem/25856933
+
+        Reviewed by Chris Dumez.
+
+        Test: http/tests/xmlhttprequest/if-modified-since-0.html
+
+        * loader/cache/CachedRawResource.cpp:
+        (WebCore::CachedRawResource::canReuse):
+        CachedResourceLoader::determineRevalidationPolicy asserts that the request is not conditional,
+        which means that it does not have any headers like If-Modified-Since.  They are usually different,
+        because we put the timestamp in the If-Modified-Since header, so it fails the canReuse test because
+        time has passed since the last If-Modified-Since header was sent.  When a user sets the If-Modified-Since
+        manually to something that is constant, we reuse cache entries when we should not.
+        * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+        (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
+        Set the source so we can use it in Internals.
+
 2016-04-30  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/loader/cache/CachedRawResource.cpp

@@ -245 +245 @@
         return false;
 
+    if (newRequest.isConditional())
+        return false;
+
     // Ensure most headers match the existing headers before continuing.
     // Note that the list of ignored headers includes some headers explicitly related to caching.

releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm

@@ -143 +143 @@
 - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)r
 {
-#if !PLATFORM(IOS)
-    UNUSED_PARAM(connection);
-#endif
-
     LOG(Network, "Handle %p delegate connection:%p didReceiveResponse:%p (HTTP status %d, reported MIMEType '%s')", m_handle, connection, r, [r respondsToSelector:@selector(statusCode)] ? [(id)r statusCode] : 0, [[r MIMEType] UTF8String]);
 
@@ -169 +165 @@
     
     ResourceResponse resourceResponse(r);
+    resourceResponse.setSource(ResourceResponse::Source::Network);
 #if ENABLE(WEB_TIMING)
     ResourceHandle::getConnectionTimingData(connection, resourceResponse.resourceLoadTiming());