Changeset 183555 in webkit

Timestamp:

Apr 29, 2015 10:09:51 AM (9 years ago)

Author:

Antti Koivisto

Message:

Main resource loaded via 304 response becomes empty if reloaded by user
​https://bugs.webkit.org/show_bug.cgi?id=144386

Reviewed by Darin Adler.

Source/WebCore:

Memory cache layer may make a main resource request conditional (add If-modified-since/If-none-match header).
DocumentLoader stores the final ResourceRequest associated with document. If user triggered reload for
conditionally loaded document DocumentLoader would include the same conditionals to the new request as well.
Since these were not added by the memory cache it would pass any 304 response back to the DocumentLoader.
However DocumentLoader has no code to handle 304 so we would end up with an empty document.

Test: http/tests/cache/main-resource-304-reload.html

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::startLoadingMainResource):

Ensure DocumentLoader doesn't issue conditional requests.

LayoutTests:

• http/tests/cache/main-resource-304-reload-expected.txt: Added.
• http/tests/cache/main-resource-304-reload.html: Added.
• http/tests/cache/resources/iframe304body.php: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/main-resource-304-reload-expected.txt (added)
• LayoutTests/http/tests/cache/main-resource-304-reload.html (added)
• LayoutTests/http/tests/cache/resources/iframe304body.php (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-04-29  Antti Koivisto  <antti@apple.com>
+
+        Main resource loaded via 304 response becomes empty if reloaded by user
+        https://bugs.webkit.org/show_bug.cgi?id=144386
+
+        Reviewed by Darin Adler.
+
+        * http/tests/cache/main-resource-304-reload-expected.txt: Added.
+        * http/tests/cache/main-resource-304-reload.html: Added.
+        * http/tests/cache/resources/iframe304body.php: Added.
+
 2015-04-29  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-29  Antti Koivisto  <antti@apple.com>
+
+        Main resource loaded via 304 response becomes empty if reloaded by user
+        https://bugs.webkit.org/show_bug.cgi?id=144386
+
+        Reviewed by Darin Adler.
+
+        Memory cache layer may make a main resource request conditional (add If-modified-since/If-none-match header).
+        DocumentLoader stores the final ResourceRequest associated with document. If user triggered reload for
+        conditionally loaded document DocumentLoader would include the same conditionals to the new request as well.
+        Since these were not added by the memory cache it would pass any 304 response back to the DocumentLoader.
+        However DocumentLoader has no code to handle 304 so we would end up with an empty document.
+
+        Test: http/tests/cache/main-resource-304-reload.html
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::startLoadingMainResource):
+
+            Ensure DocumentLoader doesn't issue conditional requests.
+
 2015-04-28  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1401 +1401 @@
     ResourceRequest request(m_request);
     request.setRequester(ResourceRequest::Requester::Main);
-    
+    // If this is a reload the cache layer might have made the previous request conditional. DocumentLoader can't handle 304 responses itself.
+    request.makeUnconditional();
+
     static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, IncludeCertificateInfo);
     CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions);