<!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>[190467] branches/safari-601.1.46-branch</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/190467">190467</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 01:04:28 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188690">r188690</a>. rdar://problem/22707471</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestscachediskcacheresourcescachetestjs">branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformnetworkResourceResponseBasecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestshttptestscachediskcachediskcachelastmodifiedexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestscachediskcachediskcachelastmodifiedhtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (190466 => 190467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 08:03:24 UTC (rev 190466)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 08:04:28 UTC (rev 190467)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-10-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188690.
+
+ 2015-08-20 Chris Dumez <cdumez@apple.com>
+
+ [Cocoa] Treat Epoch as invalid value for "Last-Modified" header
+ https://bugs.webkit.org/show_bug.cgi?id=148162
+ rdar://problem/22330837
+
+ Reviewed by Antti Koivisto.
+
+ Add better layout test coverage for using the "Last-Modified" header to
+ compute heuristic freshness. In particular, it adds coverage for the
+ following values: Epoch, malformed date.
+
+ * http/tests/cache/disk-cache/disk-cache-last-modified-expected.txt: Added.
+ * http/tests/cache/disk-cache/disk-cache-last-modified.html: Added.
+ New test.
+
+ * http/tests/cache/disk-cache/resources/cache-test.js:
+ (makeHeaderValue):
+ makeHeaderValue() was not resolving 'now(-1000)' into a date. This means that the
+ tests using it would end up sending an invalid "Last-Modified" header which our
+ networking code was translating to Epoch. We now ignore Epoch as Last-Modified
+ value for computing heuristic freshness to not cache due to malformed headers.
+
+2015-10-02 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188640.
</span><span class="cx">
</span><span class="cx"> 2015-08-19 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscachediskcachediskcachelastmodifiedexpectedtxtfromrev188690trunkLayoutTestshttptestscachediskcachediskcachelastmodifiedexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified-expected.txt (from rev 188690, trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified-expected.txt) (0 => 190467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified-expected.txt 2015-10-02 08:04:28 UTC (rev 190467)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Covers uses of 'Last-Modified' header to compute heuristic freshness.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+running 3 tests
+
+--------Testing loads from disk cache--------
+response headers: {"Last-Modified":"Thu, 01 Jan 2000 00:00:00 GMT"}
+response source: Disk cache
+
+response headers: {"Last-Modified":"Thu, 01 Jan 1970 00:00:00 GMT"}
+response source: Network
+
+response headers: {"Last-Modified":"invalid"}
+response source: Network
+
+--------Testing loads through memory cache (XHR behavior)--------
+response headers: {"Last-Modified":"Thu, 01 Jan 2000 00:00:00 GMT"}
+response source: Memory cache
+
+response headers: {"Last-Modified":"Thu, 01 Jan 1970 00:00:00 GMT"}
+response source: Network
+
+response headers: {"Last-Modified":"invalid"}
+response source: Network
+
+--------Testing loads through memory cache (subresource behavior)--------
+response headers: {"Last-Modified":"Thu, 01 Jan 2000 00:00:00 GMT"}
+response source: Memory cache
+
+response headers: {"Last-Modified":"Thu, 01 Jan 1970 00:00:00 GMT"}
+response source: Network
+
+response headers: {"Last-Modified":"invalid"}
+response source: Network
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscachediskcachediskcachelastmodifiedhtmlfromrev188690trunkLayoutTestshttptestscachediskcachediskcachelastmodifiedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified.html (from rev 188690, trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified.html) (0 => 190467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-last-modified.html 2015-10-02 08:04:28 UTC (rev 190467)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<script src="resources/cache-test.js"></script>
+<body>
+<script>
+
+var tests =
+[
+ { responseHeaders: {'Last-Modified': 'Thu, 01 Jan 2000 00:00:00 GMT' } }, // Heuristic freshness.
+ { responseHeaders: {'Last-Modified': 'Thu, 01 Jan 1970 00:00:00 GMT' } }, // Epoch.
+ { responseHeaders: {'Last-Modified': 'invalid' } }, // Invalid date
+];
+
+description("Covers uses of 'Last-Modified' header to compute heuristic freshness.");
+
+debug("running " + tests.length + " tests");
+debug("");
+
+runTests(tests);
+
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscachediskcacheresourcescachetestjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js (190466 => 190467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js 2015-10-02 08:03:24 UTC (rev 190466)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js 2015-10-02 08:04:28 UTC (rev 190467)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> return (new Date(new Date().getTime() + serverClientTimeDelta)).toUTCString();
</span><span class="cx"> if (value == 'now(100)')
</span><span class="cx"> return (new Date(new Date().getTime() + serverClientTimeDelta + 100 * 1000)).toUTCString();
</span><ins>+ if (value == 'now(-1000)')
+ return (new Date(new Date().getTime() - serverClientTimeDelta - 1000 * 1000)).toUTCString()
</ins><span class="cx"> if (value == 'unique()')
</span><span class="cx"> return "" + uniqueIdCounter++;
</span><span class="cx"> return value;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190466 => 190467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-02 08:03:24 UTC (rev 190466)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-02 08:04:28 UTC (rev 190467)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-10-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188690.
+
+ 2015-08-20 Chris Dumez <cdumez@apple.com>
+
+ [Cocoa] Treat Epoch as invalid value for "Last-Modified" header
+ https://bugs.webkit.org/show_bug.cgi?id=148162
+ rdar://problem/22330837
+
+ Reviewed by Antti Koivisto.
+
+ Ignore "Last-Modified" header when computing heuristic freshness if it
+ is Epoch. CFNetwork currently converts a malformed date for Last-Modified
+ into Epoch so there is no way for us to distinguish Epoch from invalid
+ input. Without this, we would end up with cached resources that have a
+ giant lifetime (> 4 years) due to a malformed HTTP header.
+
+ Some Websites (e.g. www.popehat.com) also wrongly return Epoch as
+ Last-Modified value and we would end up caching it overly aggressively.
+ Now that we consider Epoch as an invalid value for Last-Modified, it will
+ also work around this content bug.
+
+ Test: http/tests/cache/disk-cache/disk-cache-last-modified.html
+
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::lastModified):
+
+2015-10-02 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188634.
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp (190466 => 190467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp 2015-10-02 08:03:24 UTC (rev 190466)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp 2015-10-02 08:04:28 UTC (rev 190467)
</span><span class="lines">@@ -425,6 +425,13 @@
</span><span class="cx">
</span><span class="cx"> if (!m_haveParsedLastModifiedHeader) {
</span><span class="cx"> m_lastModified = parseDateValueInHeader(m_httpHeaderFields, HTTPHeaderName::LastModified);
</span><ins>+#if PLATFORM(COCOA)
+ // CFNetwork converts malformed dates into Epoch so we need to treat Epoch as
+ // an invalid value (rdar://problem/22352838).
+ const std::chrono::system_clock::time_point epoch;
+ if (m_lastModified && m_lastModified.value() == epoch)
+ m_lastModified = Nullopt;
+#endif
</ins><span class="cx"> m_haveParsedLastModifiedHeader = true;
</span><span class="cx"> }
</span><span class="cx"> return m_lastModified;
</span></span></pre>
</div>
</div>
</body>
</html>