<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184837] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184837">184837</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-05-23 20:15:00 -0700 (Sat, 23 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Permanent redirects should have long implicit cache lifetime
https://bugs.webkit.org/show_bug.cgi?id=145348
Source/WebCore:
rdar://problem/20680519
Reviewed by Sam Weinig.
301 Moved Permanently response that doesn't specify explicit lifetime should have long implicit lifetime.
This matches other browsers.
* platform/network/CacheValidation.cpp:
(WebCore::computeFreshnessLifetimeForHTTPFamily):
Give 301 Moved Permanently (and similarly semantically permanent 410 Gone) long implicit lifetime.
(WebCore::updateRedirectChainStatus):
LayoutTests:
Reviewed by Sam Weinig.
* http/tests/cache/cache-redirections.html:
* http/tests/cache/resources/cache-control-redirect.php:
Use less confusing name (max_age->expiration vs. max-age) and fix logic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscachecacheredirectionshtml">trunk/LayoutTests/http/tests/cache/cache-redirections.html</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcescachecontrolredirectphp">trunk/LayoutTests/http/tests/cache/resources/cache-control-redirect.php</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184836 => 184837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-24 03:14:09 UTC (rev 184836)
+++ trunk/LayoutTests/ChangeLog 2015-05-24 03:15:00 UTC (rev 184837)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-23 Antti Koivisto <antti@apple.com>
+
+ Permanent redirects should have long implicit cache lifetime
+ https://bugs.webkit.org/show_bug.cgi?id=145348
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/cache/cache-redirections.html:
+ * http/tests/cache/resources/cache-control-redirect.php:
+
+ Use less confusing name (max_age->expiration vs. max-age) and fix logic.
+
</ins><span class="cx"> 2015-05-23 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline after r184825. Remove artificial extra space between 2 text renderers.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachecacheredirectionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/cache-redirections.html (184836 => 184837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/cache-redirections.html 2015-05-24 03:14:09 UTC (rev 184836)
+++ trunk/LayoutTests/http/tests/cache/cache-redirections.html 2015-05-24 03:15:00 UTC (rev 184837)
</span><span class="lines">@@ -22,6 +22,10 @@
</span><span class="cx"> {name : "Should reload resource (no-cache redirection)", expected : false, url: baseURL + "&cache_control=no-cache&max_age=1000", reloadDelay : 0},
</span><span class="cx"> {name : "Should reload resource (must-revalidate redirection)", expected : false, url: baseURL + "&cache_control=must-revalidate&max_age=1000", reloadDelay : 0},
</span><span class="cx"> {name : "Should reload resource (expired redirection)", expected : false, url: baseURL + "&cache_control=public, max-age=1", reloadDelay : 1000},
</span><ins>+{name : "Should reload resource (implicit expiration)", expected : false, url: baseURL + "", reloadDelay : 100},
+{name : "Should reuse resource (301 cacheable redirection)", expected : true, url : baseURL + "&code=301&cache_control=public, max-age=1000", reloadDelay : 0},
+{name : "Should reuse resource (301 no-store redirection)", expected : false, url : baseURL + "&code=301&cache_control=no-store", reloadDelay : 0},
+{name : "Should reuse resource (301 implicit expiration)", expected : true, url: baseURL + "&code=301", reloadDelay : 100},
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> function loadResource()
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcescachecontrolredirectphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/cache-control-redirect.php (184836 => 184837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/cache-control-redirect.php 2015-05-24 03:14:09 UTC (rev 184836)
+++ trunk/LayoutTests/http/tests/cache/resources/cache-control-redirect.php 2015-05-24 03:15:00 UTC (rev 184837)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> else
</span><span class="cx"> header('Location: ' . $url);
</span><span class="cx">
</span><del>- $max_age = $_GET['max_age'];
- if (!isset($max_age)) {
- $expires = gmdate(DATE_RFC1123, time() + $max_age);
</del><ins>+ $expiration = $_GET['expiration'];
+ if (isset($expiration)) {
+ $expires = gmdate(DATE_RFC1123, time() + $expiration);
</ins><span class="cx"> header('Expires: ' . $expires);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184836 => 184837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-24 03:14:09 UTC (rev 184836)
+++ trunk/Source/WebCore/ChangeLog 2015-05-24 03:15:00 UTC (rev 184837)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-23 Antti Koivisto <antti@apple.com>
+
+ Permanent redirects should have long implicit cache lifetime
+ https://bugs.webkit.org/show_bug.cgi?id=145348
+ rdar://problem/20680519
+
+ Reviewed by Sam Weinig.
+
+ 301 Moved Permanently response that doesn't specify explicit lifetime should have long implicit lifetime.
+ This matches other browsers.
+
+ * platform/network/CacheValidation.cpp:
+ (WebCore::computeFreshnessLifetimeForHTTPFamily):
+
+ Give 301 Moved Permanently (and similarly semantically permanent 410 Gone) long implicit lifetime.
+
+ (WebCore::updateRedirectChainStatus):
+
</ins><span class="cx"> 2015-05-23 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup after r184796
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (184836 => 184837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2015-05-24 03:14:09 UTC (rev 184836)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2015-05-24 03:15:00 UTC (rev 184837)
</span><span class="lines">@@ -120,14 +120,20 @@
</span><span class="cx"> if (expires)
</span><span class="cx"> return duration_cast<microseconds>(expires.value() - dateValue);
</span><span class="cx">
</span><del>- // Heuristic Freshness:
- // http://tools.ietf.org/html/rfc7234#section-4.2.2
- auto lastModified = response.lastModified();
- if (lastModified)
- return duration_cast<microseconds>((dateValue - lastModified.value()) * 0.1);
-
- // If no cache headers are present, the specification leaves the decision to the UA. Other browsers seem to opt for 0.
- return microseconds::zero();
</del><ins>+ // Implicit lifetime.
+ switch (response.httpStatusCode()) {
+ case 301: // Moved Permanently
+ case 410: // Gone
+ // These are semantically permanent and so get long implicit lifetime.
+ return hours(365 * 24);
+ default:
+ // Heuristic Freshness:
+ // http://tools.ietf.org/html/rfc7234#section-4.2.2
+ auto lastModified = response.lastModified();
+ if (lastModified)
+ return duration_cast<microseconds>((dateValue - lastModified.value()) * 0.1);
+ return microseconds::zero();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void updateRedirectChainStatus(RedirectChainCacheStatus& redirectChainCacheStatus, const ResourceResponse& response)
</span></span></pre>
</div>
</div>
</body>
</html>