Changeset 72303 in webkit

Timestamp:

Nov 18, 2010 9:59:53 AM (13 years ago)

Author:

Joseph Pecoraro

Message:

2010-11-18 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Darin Adler.

Allow no-store resources to be used for back navigation
​https://bugs.webkit.org/show_bug.cgi?id=49672

Add tests for checking if the cache was used for a "Cache-control: no-store"
resource in back navigation, reload navigation, and normal navigation.

• http/tests/cache/history-only-cached-subresource-loads-expected.txt: Added.
• http/tests/cache/history-only-cached-subresource-loads.html: Added.
• http/tests/cache/resources/no-store-resource-forward.html: Added.
• http/tests/cache/resources/no-store-resource-next.html: Added.
• http/tests/cache/resources/no-store-resource.html: Added.
• http/tests/cache/resources/random.cgi: Added.

2010-11-18 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Darin Adler.

Allow no-store resources to be used for back navigation
​https://bugs.webkit.org/show_bug.cgi?id=49672

Test: http/tests/cache/history-only-cached-subresource-loads.html

HTTP allows "Cache-Control: no-store" resources to "cached" for the
purposes of history, such as back/forward navigation. Previously
WebCore just immediately evicted these resources, now we leave them in
the cache as long as they are not "https". This allows us to use them
if they are used in a back navigation, or lazily evict and replace
them on other load types expecting non-stale resources.

(WebCore::CachedResource::CachedResource):
(WebCore::CachedResource::removeClient): instead of immediately removing the resource from the cache, leave it in the cache.

• loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::checkForReload): (WebCore::CachedResourceLoader::requestResource): allow history only resources if the CachePolicy is CachePolicyHistoryBuffer (back/forward navigation).
• loader/cache/MemoryCache.cpp: (WebCore::MemoryCache::requestResource): lazily remove history only resources if it is requested for a load type expecting non-stale resources.
• loader/cache/MemoryCache.h: default the forHistory parameter to false.

Rename cache policy CachePolicyAllowStale to CachePolicyHistoryBuffer.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::subresourceCachePolicy):
• loader/cache/CachePolicy.h:
• loader/cache/CachedResource.cpp:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/history-only-cached-subresource-loads-expected.txt (added)
• LayoutTests/http/tests/cache/history-only-cached-subresource-loads.html (added)
• LayoutTests/http/tests/cache/resources/no-store-resource-forward.html (added)
• LayoutTests/http/tests/cache/resources/no-store-resource-next.html (added)
• LayoutTests/http/tests/cache/resources/no-store-resource.html (added)
• LayoutTests/http/tests/cache/resources/random.cgi (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/loader/cache/CachePolicy.h (modified) (1 diff)
• WebCore/loader/cache/CachedResource.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)
• WebCore/loader/cache/MemoryCache.cpp (modified) (2 diffs)
• WebCore/loader/cache/MemoryCache.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-18  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Allow no-store resources to be used for back navigation
+        https://bugs.webkit.org/show_bug.cgi?id=49672
+
+        Add tests for checking if the cache was used for a "Cache-control: no-store"
+        resource in back navigation, reload navigation, and normal navigation.
+
+        * http/tests/cache/history-only-cached-subresource-loads-expected.txt: Added.
+        * http/tests/cache/history-only-cached-subresource-loads.html: Added.
+        * http/tests/cache/resources/no-store-resource-forward.html: Added.
+        * http/tests/cache/resources/no-store-resource-next.html: Added.
+        * http/tests/cache/resources/no-store-resource.html: Added.
+        * http/tests/cache/resources/random.cgi: Added.
+
 2010-11-18  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-18  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Allow no-store resources to be used for back navigation
+        https://bugs.webkit.org/show_bug.cgi?id=49672
+
+        Test: http/tests/cache/history-only-cached-subresource-loads.html
+
+        HTTP allows "Cache-Control: no-store" resources to "cached" for the
+        purposes of history, such as back/forward navigation. Previously
+        WebCore just immediately evicted these resources, now we leave them in
+        the cache as long as they are not "https". This allows us to use them
+        if they are used in a back navigation, or lazily evict and replace
+        them on other load types expecting non-stale resources.
+
+        (WebCore::CachedResource::CachedResource):
+        (WebCore::CachedResource::removeClient): instead of immediately removing the resource from the cache, leave it in the cache.
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::checkForReload):
+        (WebCore::CachedResourceLoader::requestResource): allow history only resources if the CachePolicy is CachePolicyHistoryBuffer (back/forward navigation).
+        * loader/cache/MemoryCache.cpp:
+        (WebCore::MemoryCache::requestResource): lazily remove history only resources if it is requested for a load type expecting non-stale resources.
+        * loader/cache/MemoryCache.h: default the forHistory parameter to false.
+
+          Rename cache policy CachePolicyAllowStale to CachePolicyHistoryBuffer.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::subresourceCachePolicy):
+        * loader/cache/CachePolicy.h:
+        * loader/cache/CachedResource.cpp:
+
 2010-11-18  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2320 +2320 @@
 
     if (request.cachePolicy() == ReturnCacheDataElseLoad)
-        return CachePolicyAllowStale;
+        return CachePolicyHistoryBuffer;
 
     return CachePolicyVerify;

trunk/WebCore/loader/cache/CachePolicy.h

@@ -34 +34 @@
         CachePolicyRevalidate,
         CachePolicyReload,
-        CachePolicyAllowStale
+        CachePolicyHistoryBuffer
     };
 

trunk/WebCore/loader/cache/CachedResource.cpp

@@ -253 +253 @@
         if (response().cacheControlContainsNoStore()) {
             // RFC2616 14.9.2:
-            // "no-store: ...MUST make a best-effort attempt to remove the information from volatile storage as promptly as possible"
-            cache()->remove(this);
+            // "no-store: ... MUST make a best-effort attempt to remove the information from volatile storage as promptly as possible"
+            // "... History buffers MAY store such responses as part of their normal operation."
+            // We allow non-secure content to be reused in history, but we do not allow secure content to be reused.
+            if (protocolIs(url(), "https"))
+                cache()->remove(this);
         } else
             cache()->prune();

trunk/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -114 +114 @@
         cache()->revalidateResource(existing, this);
         break;
-    case CachePolicyAllowStale:
+    case CachePolicyHistoryBuffer:
         return;
     }
@@ -264 +264 @@
     checkForReload(fullURL);
 
-    CachedResource* resource = cache()->requestResource(this, type, fullURL, charset, isPreload);
+    bool allowForHistoryOnlyResources = cachePolicy() == CachePolicyHistoryBuffer;
+    CachedResource* resource = cache()->requestResource(this, type, fullURL, charset, isPreload, allowForHistoryOnlyResources);
     if (resource) {
         // Check final URL of resource to catch redirects.

trunk/WebCore/loader/cache/MemoryCache.cpp

@@ -95 +95 @@
 }
 
-CachedResource* MemoryCache::requestResource(CachedResourceLoader* cachedResourceLoader, CachedResource::Type type, const KURL& url, const String& charset, bool requestIsPreload)
-{
-    LOG(ResourceLoading, "MemoryCache::requestResource '%s', charset '%s', preload=%u", url.string().latin1().data(), charset.latin1().data(), requestIsPreload);
+CachedResource* MemoryCache::requestResource(CachedResourceLoader* cachedResourceLoader, CachedResource::Type type, const KURL& url, const String& charset, bool requestIsPreload, bool forHistory)
+{
+    LOG(ResourceLoading, "MemoryCache::requestResource '%s', charset '%s', preload=%u, forHistory=%u", url.string().latin1().data(), charset.latin1().data(), requestIsPreload, forHistory);
 
     // FIXME: Do we really need to special-case an empty URL?
@@ -106 +106 @@
     // Look up the resource in our map.
     CachedResource* resource = resourceForURL(url.string());
+
+    // Non https "no-store" resources are left in the cache to be used for back/forward navigation only.
+    // If this is not a request forHistory and the resource was served with "no-store" we should evict
+    // it here and make a fresh request.
+    if (!forHistory && resource && resource->response().cacheControlContainsNoStore()) {
+        LOG(ResourceLoading, "MemoryCache::requestResource cleared a for history only resource due to a non-history request for the resource");
+        evict(resource);
+        resource = 0;
+    }
 
     if (resource && requestIsPreload && !resource->isPreloaded()) {

trunk/WebCore/loader/cache/MemoryCache.h

@@ -110 +110 @@
     // Request resources from the cache.  A load will be initiated and a cache object created if the object is not
     // found in the cache.
-    CachedResource* requestResource(CachedResourceLoader*, CachedResource::Type, const KURL& url, const String& charset, bool isPreload = false);
+    CachedResource* requestResource(CachedResourceLoader*, CachedResource::Type, const KURL& url, const String& charset, bool isPreload = false, bool forHistory = false);
 
     CachedCSSStyleSheet* requestUserCSSStyleSheet(CachedResourceLoader*, const String& url, const String& charset);