Changeset 182154 in webkit

Timestamp:

Mar 30, 2015, 3:00:17 PM (10 years ago)

Author:

Antti Koivisto

Message:

Don't cache resources that are very unlikely to be reused
​https://bugs.webkit.org/show_bug.cgi?id=143226

Reviewed by Chris Dumez.

Source/WebKit2:

Follow-up to cover Cache-control: no-cache case which also has zero cache lifetime.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::makeStoreDecision):

LayoutTests:

• http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2015-03-30  Antti Koivisto  <antti@apple.com>
+
+        Don't cache resources that are very unlikely to be reused
+        https://bugs.webkit.org/show_bug.cgi?id=143226
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt:
+
 2015-03-30  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt ¶

@@ -31 +31 @@
 
 response headers: {"Cache-control":"max-age=100, no-cache"}
-response source: Disk cache
+response source: Network
 
 response headers: {"ETag":"match"}
@@ -112 +112 @@
 
 response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate"}
-response source: Disk cache
+response source: Network
 
 response headers: {"ETag":"match","Cache-control":"must-revalidate"}

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2015-03-30  Antti Koivisto  <antti@apple.com>
+
+        Don't cache resources that are very unlikely to be reused
+        https://bugs.webkit.org/show_bug.cgi?id=143226
+
+        Reviewed by Chris Dumez.
+
+        Follow-up to cover Cache-control: no-cache case which also has zero cache lifetime.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::makeStoreDecision):
+
 2015-03-30  Antti Koivisto  <antti@apple.com>
 

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

@@ -280 +280 @@
     if (!storeUnconditionallyForHistoryNavigation) {
         auto currentTime = std::chrono::duration<double>(std::chrono::system_clock::now().time_since_epoch());
-        bool hasNonZeroLifetime = WebCore::computeFreshnessLifetimeForHTTPFamily(response, currentTime.count()) > 0;
+        bool hasNonZeroLifetime = !response.cacheControlContainsNoCache() && WebCore::computeFreshnessLifetimeForHTTPFamily(response, currentTime.count()) > 0;
 
         bool possiblyReusable = response.hasCacheValidatorFields() || hasNonZeroLifetime;