<!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>[183555] 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/183555">183555</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-04-29 10:09:51 -0700 (Wed, 29 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Main resource loaded via 304 response becomes empty if reloaded by user
https://bugs.webkit.org/show_bug.cgi?id=144386
Reviewed by Darin Adler.
Source/WebCore:
Memory cache layer may make a main resource request conditional (add If-modified-since/If-none-match header).
DocumentLoader stores the final ResourceRequest associated with document. If user triggered reload for
conditionally loaded document DocumentLoader would include the same conditionals to the new request as well.
Since these were not added by the memory cache it would pass any 304 response back to the DocumentLoader.
However DocumentLoader has no code to handle 304 so we would end up with an empty document.
Test: http/tests/cache/main-resource-304-reload.html
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::startLoadingMainResource):
Ensure DocumentLoader doesn't issue conditional requests.
LayoutTests:
* http/tests/cache/main-resource-304-reload-expected.txt: Added.
* http/tests/cache/main-resource-304-reload.html: Added.
* http/tests/cache/resources/iframe304body.php: 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="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscachemainresource304reloadexpectedtxt">trunk/LayoutTests/http/tests/cache/main-resource-304-reload-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachemainresource304reloadhtml">trunk/LayoutTests/http/tests/cache/main-resource-304-reload.html</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcesiframe304bodyphp">trunk/LayoutTests/http/tests/cache/resources/iframe304body.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183554 => 183555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-29 16:50:10 UTC (rev 183554)
+++ trunk/LayoutTests/ChangeLog 2015-04-29 17:09:51 UTC (rev 183555)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-29 Antti Koivisto <antti@apple.com>
+
+ Main resource loaded via 304 response becomes empty if reloaded by user
+ https://bugs.webkit.org/show_bug.cgi?id=144386
+
+ Reviewed by Darin Adler.
+
+ * http/tests/cache/main-resource-304-reload-expected.txt: Added.
+ * http/tests/cache/main-resource-304-reload.html: Added.
+ * http/tests/cache/resources/iframe304body.php: Added.
+
</ins><span class="cx"> 2015-04-29 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement Unicode code point escapes
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachemainresource304reloadexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/main-resource-304-reload-expected.txt (0 => 183555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/main-resource-304-reload-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/cache/main-resource-304-reload-expected.txt 2015-04-29 17:09:51 UTC (rev 183555)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Verify that document loaded with 304 response can be reloaded correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS iframe.contentDocument.body.textContent is "body text"
+PASS iframe.contentDocument.body.textContent is "body text"
+Reloading
+PASS iframe.contentDocument.body.textContent is "body text"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachemainresource304reloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/main-resource-304-reload.html (0 => 183555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/main-resource-304-reload.html (rev 0)
+++ trunk/LayoutTests/http/tests/cache/main-resource-304-reload.html 2015-04-29 17:09:51 UTC (rev 183555)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<script>
+jsTestIsAsync = true;
+
+description("Verify that document loaded with 304 response can be reloaded correctly.");
+
+var iframe;
+
+function loadFrame(onload)
+{
+ if (iframe)
+ document.body.removeChild(iframe);
+ iframe = document.createElement("iframe");
+ iframe.src = "resources/iframe304body.php";
+ iframe.onload = onload;
+ document.body.appendChild(iframe);
+}
+
+function verify() {
+ shouldBeEqualToString("iframe.contentDocument.body.textContent", "body text");
+}
+
+function test() {
+ loadFrame(function () {
+ verify();
+ loadFrame(function () {
+ verify();
+ iframe.onload = function () {
+ verify();
+ finishJSTest();
+ };
+ debug("Reloading");
+ iframe.contentWindow.internals.forceReload(false);
+ });
+ });
+}
+</script>
+</head>
+<body onload="test()">
+<script src="/js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcesiframe304bodyphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/resources/iframe304body.php (0 => 183555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/iframe304body.php (rev 0)
+++ trunk/LayoutTests/http/tests/cache/resources/iframe304body.php 2015-04-29 17:09:51 UTC (rev 183555)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<?php
+require_once '../../resources/portabilityLayer.php';
+
+clearstatcache();
+
+if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
+ header("HTTP/1.0 304 Not Modified");
+ exit();
+}
+header('Cache-Control: no-cache');
+header('Content-Type: text/html');
+header('Etag: 123456789');
+?>
+body text
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183554 => 183555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-29 16:50:10 UTC (rev 183554)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 17:09:51 UTC (rev 183555)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-29 Antti Koivisto <antti@apple.com>
+
+ Main resource loaded via 304 response becomes empty if reloaded by user
+ https://bugs.webkit.org/show_bug.cgi?id=144386
+
+ Reviewed by Darin Adler.
+
+ Memory cache layer may make a main resource request conditional (add If-modified-since/If-none-match header).
+ DocumentLoader stores the final ResourceRequest associated with document. If user triggered reload for
+ conditionally loaded document DocumentLoader would include the same conditionals to the new request as well.
+ Since these were not added by the memory cache it would pass any 304 response back to the DocumentLoader.
+ However DocumentLoader has no code to handle 304 so we would end up with an empty document.
+
+ Test: http/tests/cache/main-resource-304-reload.html
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::startLoadingMainResource):
+
+ Ensure DocumentLoader doesn't issue conditional requests.
+
</ins><span class="cx"> 2015-04-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace HTMLMediaElement's seek timer with a task queue.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (183554 => 183555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-04-29 16:50:10 UTC (rev 183554)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-04-29 17:09:51 UTC (rev 183555)
</span><span class="lines">@@ -1400,7 +1400,9 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(m_request);
</span><span class="cx"> request.setRequester(ResourceRequest::Requester::Main);
</span><del>-
</del><ins>+ // If this is a reload the cache layer might have made the previous request conditional. DocumentLoader can't handle 304 responses itself.
+ request.makeUnconditional();
+
</ins><span class="cx"> static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, IncludeCertificateInfo);
</span><span class="cx"> CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions);
</span><span class="cx"> cachedResourceRequest.setInitiator(*this);
</span></span></pre>
</div>
</div>
</body>
</html>