<!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>[182659] trunk/Source/WebCore</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/182659">182659</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-11 11:25:49 -0700 (Sat, 11 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop referring to outdated RFC2616 in CacheValidation.cpp
https://bugs.webkit.org/show_bug.cgi?id=143619
Reviewed by Darin Adler.
Stop referring to outdated RFC2616 in CacheValidation.cpp and refer to
the newer RFC7230 & RFC7234. Also update some variables to match the
naming in the RFC for clarity.
No behavior change.
* platform/network/CacheValidation.cpp:
(WebCore::updateResponseHeadersAfterRevalidation):
(WebCore::computeCurrentAge):
(WebCore::computeFreshnessLifetimeForHTTPFamily):
(WebCore::isCacheHeaderSeparator):
(WebCore::parseCacheControlDirectives):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182658 => 182659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-11 18:13:10 UTC (rev 182658)
+++ trunk/Source/WebCore/ChangeLog 2015-04-11 18:25:49 UTC (rev 182659)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-11 Chris Dumez <cdumez@apple.com>
+
+ Stop referring to outdated RFC2616 in CacheValidation.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=143619
+
+ Reviewed by Darin Adler.
+
+ Stop referring to outdated RFC2616 in CacheValidation.cpp and refer to
+ the newer RFC7230 & RFC7234. Also update some variables to match the
+ naming in the RFC for clarity.
+
+ No behavior change.
+
+ * platform/network/CacheValidation.cpp:
+ (WebCore::updateResponseHeadersAfterRevalidation):
+ (WebCore::computeCurrentAge):
+ (WebCore::computeFreshnessLifetimeForHTTPFamily):
+ (WebCore::isCacheHeaderSeparator):
+ (WebCore::parseCacheControlDirectives):
+
</ins><span class="cx"> 2015-04-11 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> WebKit places caret in front of pasted Numbers cells instead of behind
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (182658 => 182659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2015-04-11 18:13:10 UTC (rev 182658)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2015-04-11 18:25:49 UTC (rev 182659)
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx">
</span><span class="cx"> void updateResponseHeadersAfterRevalidation(ResourceResponse& response, const ResourceResponse& validatingResponse)
</span><span class="cx"> {
</span><del>- // RFC2616 10.3.5
- // Update cached headers from the 304 response
</del><ins>+ // Freshening stored response upon validation:
+ // http://tools.ietf.org/html/rfc7234#section-4.3.4
</ins><span class="cx"> for (const auto& header : validatingResponse.httpHeaderFields()) {
</span><span class="cx"> // Entity headers should not be sent by servers when generating a 304
</span><span class="cx"> // response; misconfigured servers send them anyway. We shouldn't allow
</span><span class="lines">@@ -89,37 +89,43 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::chrono::microseconds computeCurrentAge(const ResourceResponse& response, std::chrono::system_clock::time_point responseTimestamp)
</del><ins>+std::chrono::microseconds computeCurrentAge(const ResourceResponse& response, std::chrono::system_clock::time_point responseTime)
</ins><span class="cx"> {
</span><span class="cx"> using namespace std::chrono;
</span><span class="cx">
</span><del>- // RFC2616 13.2.3
- // No compensation for latency as that is not terribly important in practice
</del><ins>+ // Age calculation:
+ // http://tools.ietf.org/html/rfc7234#section-4.2.3
+ // No compensation for latency as that is not terribly important in practice.
</ins><span class="cx"> auto dateValue = response.date();
</span><del>- auto apparentAge = dateValue ? std::max(microseconds::zero(), duration_cast<microseconds>(responseTimestamp - dateValue.value())) : microseconds::zero();
- auto ageValue = response.age();
- auto correctedReceivedAge = ageValue ? std::max(apparentAge, ageValue.value()) : apparentAge;
- auto residentTime = duration_cast<microseconds>(system_clock::now() - responseTimestamp);
- return correctedReceivedAge + residentTime;
</del><ins>+ auto apparentAge = dateValue ? std::max(microseconds::zero(), duration_cast<microseconds>(responseTime - dateValue.value())) : microseconds::zero();
+ auto ageValue = response.age().valueOr(microseconds::zero());
+ auto correctedInitialAge = std::max(apparentAge, ageValue);
+ auto residentTime = duration_cast<microseconds>(system_clock::now() - responseTime);
+ return correctedInitialAge + residentTime;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::chrono::microseconds computeFreshnessLifetimeForHTTPFamily(const ResourceResponse& response, std::chrono::system_clock::time_point responseTimestamp)
</del><ins>+std::chrono::microseconds computeFreshnessLifetimeForHTTPFamily(const ResourceResponse& response, std::chrono::system_clock::time_point responseTime)
</ins><span class="cx"> {
</span><span class="cx"> using namespace std::chrono;
</span><span class="cx"> ASSERT(response.url().protocolIsInHTTPFamily());
</span><span class="cx">
</span><del>- // RFC2616 13.2.4
</del><ins>+ // Freshness Lifetime:
+ // http://tools.ietf.org/html/rfc7234#section-4.2.1
</ins><span class="cx"> auto maxAge = response.cacheControlMaxAge();
</span><span class="cx"> if (maxAge)
</span><span class="cx"> return maxAge.value();
</span><span class="cx"> auto expires = response.expires();
</span><span class="cx"> auto date = response.date();
</span><del>- auto creationTime = date ? date.value() : responseTimestamp;
</del><ins>+ auto dateValue = date ? date.value() : responseTime;
</ins><span class="cx"> if (expires)
</span><del>- return duration_cast<microseconds>(expires.value() - creationTime);
</del><ins>+ return duration_cast<microseconds>(expires.value() - dateValue);
+
+ // Heuristic Freshness:
+ // http://tools.ietf.org/html/rfc7234#section-4.2.2
</ins><span class="cx"> auto lastModified = response.lastModified();
</span><span class="cx"> if (lastModified)
</span><del>- return duration_cast<microseconds>((creationTime - lastModified.value()) * 0.1);
</del><ins>+ return duration_cast<microseconds>((dateValue - lastModified.value()) * 0.1);
+
</ins><span class="cx"> // If no cache headers are present, the specification leaves the decision to the UA. Other browsers seem to opt for 0.
</span><span class="cx"> return microseconds::zero();
</span><span class="cx"> }
</span><span class="lines">@@ -158,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool isCacheHeaderSeparator(UChar c)
</span><span class="cx"> {
</span><del>- // See RFC 2616, Section 2.2
</del><ins>+ // http://tools.ietf.org/html/rfc7230#section-3.2.6
</ins><span class="cx"> switch (c) {
</span><span class="cx"> case '(':
</span><span class="cx"> case ')':
</span><span class="lines">@@ -265,8 +271,9 @@
</span><span class="cx">
</span><span class="cx"> size_t directivesSize = directives.size();
</span><span class="cx"> for (size_t i = 0; i < directivesSize; ++i) {
</span><del>- // RFC2616 14.9.1: A no-cache directive with a value is only meaningful for proxy caches.
</del><ins>+ // A no-cache directive with a value is only meaningful for proxy caches.
</ins><span class="cx"> // It should be ignored by a browser level cache.
</span><ins>+ // http://tools.ietf.org/html/rfc7234#section-5.2.2.2
</ins><span class="cx"> if (equalIgnoringCase(directives[i].first, "no-cache") && directives[i].second.isEmpty())
</span><span class="cx"> result.noCache = true;
</span><span class="cx"> else if (equalIgnoringCase(directives[i].first, "no-store"))
</span></span></pre>
</div>
</div>
</body>
</html>