<!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>[200326] 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/200326">200326</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-05-02 11:05:46 -0700 (Mon, 02 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not reuse cache entries with conditional headers
https://bugs.webkit.org/show_bug.cgi?id=157205
rdar://problem/25856933
Reviewed by Chris Dumez.
Source/WebCore:
Test: http/tests/xmlhttprequest/if-modified-since-0.html
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::canReuse):
CachedResourceLoader::determineRevalidationPolicy asserts that the request is not conditional,
which means that it does not have any headers like If-Modified-Since. They are usually different,
because we put the timestamp in the If-Modified-Since header, so it fails the canReuse test because
time has passed since the last If-Modified-Since header was sent. When a user sets the If-Modified-Since
manually to something that is constant, we reuse cache entries when we should not.
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
Set the source so we can use it in Internals.
LayoutTests:
* http/tests/xmlhttprequest/if-modified-since-0-expected.txt: Added.
* http/tests/xmlhttprequest/if-modified-since-0.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestifmodifiedsince0expectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestifmodifiedsince0html">trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200325 => 200326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-02 17:38:15 UTC (rev 200325)
+++ trunk/LayoutTests/ChangeLog 2016-05-02 18:05:46 UTC (rev 200326)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-29 Alex Christensen <achristensen@webkit.org>
+
+ Do not reuse cache entries with conditional headers
+ https://bugs.webkit.org/show_bug.cgi?id=157205
+ rdar://problem/25856933
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/xmlhttprequest/if-modified-since-0-expected.txt: Added.
+ * http/tests/xmlhttprequest/if-modified-since-0.html: Added.
+
</ins><span class="cx"> 2016-05-01 Skachkov Oleksandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> Class contructor and methods shouldn't have "arguments" and "caller"
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestifmodifiedsince0expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0-expected.txt (0 => 200326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0-expected.txt 2016-05-02 18:05:46 UTC (rev 200326)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+ALERT: PASS
+ALERT: PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestifmodifiedsince0html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0.html (0 => 200326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/if-modified-since-0.html 2016-05-02 18:05:46 UTC (rev 200326)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<script>
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+var req1 = new XMLHttpRequest();
+req1.onreadystatechange = function () {
+ if (this.readyState == 4) {
+ alert(internals.xhrResponseSource(req1) == "Network" ? "PASS" : "FAIL");
+ var req2 = new XMLHttpRequest();
+ req2.onreadystatechange = function () {
+ if (this.readyState == 4) {
+ alert(internals.xhrResponseSource(req2) == "Network" ? "PASS" : "FAIL");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ }
+ req2.open("GET", "resources/get.txt");
+ req2.setRequestHeader("If-Modified-Since", "0");
+ req2.send(null);
+ }
+};
+req1.open("GET", "resources/get.txt");
+req1.setRequestHeader("If-Modified-Since", "0");
+req1.send(null);
+
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200325 => 200326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-02 17:38:15 UTC (rev 200325)
+++ trunk/Source/WebCore/ChangeLog 2016-05-02 18:05:46 UTC (rev 200326)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-04-29 Alex Christensen <achristensen@webkit.org>
+
+ Do not reuse cache entries with conditional headers
+ https://bugs.webkit.org/show_bug.cgi?id=157205
+ rdar://problem/25856933
+
+ Reviewed by Chris Dumez.
+
+ Test: http/tests/xmlhttprequest/if-modified-since-0.html
+
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::canReuse):
+ CachedResourceLoader::determineRevalidationPolicy asserts that the request is not conditional,
+ which means that it does not have any headers like If-Modified-Since. They are usually different,
+ because we put the timestamp in the If-Modified-Since header, so it fails the canReuse test because
+ time has passed since the last If-Modified-Since header was sent. When a user sets the If-Modified-Since
+ manually to something that is constant, we reuse cache entries when we should not.
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
+ Set the source so we can use it in Internals.
+
</ins><span class="cx"> 2016-05-02 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Speculatively fix the cmake build
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (200325 => 200326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-05-02 17:38:15 UTC (rev 200325)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-05-02 18:05:46 UTC (rev 200326)
</span><span class="lines">@@ -254,6 +254,9 @@
</span><span class="cx"> if (m_resourceRequest.allowCookies() != newRequest.allowCookies())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (newRequest.isConditional())
+ return false;
+
</ins><span class="cx"> // Ensure most headers match the existing headers before continuing.
</span><span class="cx"> // Note that the list of ignored headers includes some headers explicitly related to caching.
</span><span class="cx"> // A more detailed check of caching policy will be performed later, this is simply a list of
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (200325 => 200326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2016-05-02 17:38:15 UTC (rev 200325)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2016-05-02 18:05:46 UTC (rev 200326)
</span><span class="lines">@@ -142,10 +142,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)r
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
- UNUSED_PARAM(connection);
-#endif
-
</del><span class="cx"> LOG(Network, "Handle %p delegate connection:%p didReceiveResponse:%p (HTTP status %d, reported MIMEType '%s')", m_handle, connection, r, [r respondsToSelector:@selector(statusCode)] ? [(id)r statusCode] : 0, [[r MIMEType] UTF8String]);
</span><span class="cx">
</span><span class="cx"> if (!m_handle || !m_handle->client())
</span><span class="lines">@@ -170,6 +166,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ResourceResponse resourceResponse(r);
</span><ins>+ resourceResponse.setSource(ResourceResponse::Source::Network);
</ins><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> ResourceHandle::getConnectionTimingData(connection, resourceResponse.resourceLoadTiming());
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>