<!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>[208458] branches/safari-602-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/208458">208458</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 11:44:06 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208437">r208437</a>. rdar://problem/29032334</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp">branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh">branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationhttpauthexpectedtxt">branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationhttpauthhtml">branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth.html</a></li>
<li><a href="#branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationresourcesframewithauthenticatedresourcephp">branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/frame-with-authenticated-resource.php</a></li>
<li><a href="#branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationresourcesresourcewithauthphp">branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/resource-with-auth.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (208457 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-11-09 19:40:37 UTC (rev 208457)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-11-09 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208437. rdar://problem/29032334
+
+ 2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Network cache speculative revalidation can cause loads to hang
+ https://bugs.webkit.org/show_bug.cgi?id=164532
+ <rdar://problem/28519331>
+
+ Reviewed by Alex Christensen.
+
+ Add layout test coverage. The test hangs without the fix.
+
+ * http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt: Added.
+ * http/tests/cache/disk-cache/speculative-validation/http-auth.html: Added.
+ * http/tests/cache/disk-cache/speculative-validation/resources/frame-with-authenticated-resource.php: Added.
+ * http/tests/cache/disk-cache/speculative-validation/resources/resource-with-auth.php: Added.
+
</ins><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r208314. rdar://problem/29084077
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationhttpauthexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt (0 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUsername:testPassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+Tests speculative revalidation of authenticated resources.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS xhr.status is 401
+PASS Successfuly loaded.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationhttpauthhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth.html (0 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth.html 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<script>
+description("Tests speculative revalidation of authenticated resources.");
+jsTestIsAsync = true;
+
+testRunner.setHandlesAuthenticationChallenges(true);
+testRunner.setAuthenticationUsername("testUsername");
+testRunner.setAuthenticationPassword("testPassword");
+
+state = "warmup";
+
+function clearCredentialStorage()
+{
+ xhr = new XMLHttpRequest();
+ xhr.open("GET", "resources/resource-with-auth.php?other", false, "badUsername", "badPassword");
+ xhr.send();
+ shouldBe("xhr.status", "401");
+}
+
+function frameLoaded()
+{
+ if (state == "warmup") {
+ // Navigate frame to 'about:blank' to flush to subresource loads metadata to disk.
+ state = "flushingMetadata";
+ testRunner.setHandlesAuthenticationChallenges(false);
+ document.getElementById("testFrame").src = "about:blank";
+ return;
+ }
+ if (state == "flushingMetadata") {
+ clearCredentialStorage();
+
+ internals.clearMemoryCache();
+ testRunner.setHandlesAuthenticationChallenges(false);
+
+ // Navigate frame to its original location again. This time it should speculatively
+ // validate subresources as we have subresource loads metadata in the disk cache.
+ state = "speculativeRevalidation";
+ document.getElementById("testFrame").src = "resources/frame-with-authenticated-resource.php";
+ return;
+ }
+ if (state == "speculativeRevalidation") {
+ testPassed("Successfuly loaded.");
+
+ finishJSTest();
+ return;
+ }
+}
+
+</script>
+<iframe id="testFrame" src="resources/frame-with-authenticated-resource.php" onload="frameLoaded()"></iframe>
+<script src="/js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationresourcesframewithauthenticatedresourcephp"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/frame-with-authenticated-resource.php (0 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/frame-with-authenticated-resource.php (rev 0)
+++ branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/frame-with-authenticated-resource.php 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<?php
+header('Content-Type: text/html');
+header('Cache-Control: max-age=0');
+header('Etag: 123456789');
+
+?>
+<!DOCTYPE html>
+<body>
+<script src="resource-with-auth.php"></script>
+</body>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestscachediskcachespeculativevalidationresourcesresourcewithauthphp"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/resource-with-auth.php (0 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/resource-with-auth.php (rev 0)
+++ branches/safari-602-branch/LayoutTests/http/tests/cache/disk-cache/speculative-validation/resources/resource-with-auth.php 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<?php
+$expectedUsername = 'testUsername';
+$expectedPassword = 'testPassword';
+$realm = $_SERVER['REQUEST_URI'];
+
+header('Content-Type: text/javascript');
+header('Cache-Control: max-age=0');
+header('Etag: 123456789');
+
+if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != $expectedUsername ||
+ !isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_PW'] != $expectedPassword) {
+ header("WWW-Authenticate: Basic realm=\"" . $realm . "\"");
+ header('HTTP/1.0 401 Unauthorized');
+ print 'Sent username:password of (' . $_SERVER['PHP_AUTH_USER'] . ':' . $_SERVER['PHP_AUTH_PW'] . ') which is not what was expected';
+ exit;
+}
+?>
+loaded = true;
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (208457 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-11-09 19:40:37 UTC (rev 208457)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-09 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208437. rdar://problem/29032334
+
+ 2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Network cache speculative revalidation can cause loads to hang
+ https://bugs.webkit.org/show_bug.cgi?id=164532
+ <rdar://problem/28519331>
+
+ Reviewed by Alex Christensen.
+
+ Network cache speculative revalidation could cause loads to hang when HTTP
+ authentication was involved because NetworkCacheSpeculativeLoad failed to
+ call NetworkLoad::continueCanAuthenticateAgainstProtectionSpace() in its
+ canAuthenticateAgainstProtectionSpaceAsync() callback.
+
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+ (WebKit::NetworkCache::SpeculativeLoad::canAuthenticateAgainstProtectionSpaceAsync):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+
</ins><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r208328. rdar://problem/29084886
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (208457 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2016-11-09 19:40:37 UTC (rev 208457)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -114,6 +114,11 @@
</span><span class="cx"> didComplete();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SpeculativeLoad::canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&)
+{
+ m_networkLoad->continueCanAuthenticateAgainstProtectionSpace(false);
+}
+
</ins><span class="cx"> void SpeculativeLoad::didFailLoading(const ResourceError&)
</span><span class="cx"> {
</span><span class="cx"> m_cacheEntryForValidation = nullptr;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (208457 => 208458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-11-09 19:40:37 UTC (rev 208457)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-11-09 19:44:06 UTC (rev 208458)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> private:
</span><span class="cx"> // NetworkLoadClient.
</span><span class="cx"> void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override { }
</span><del>- void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) override { }
</del><ins>+ void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) override;
</ins><span class="cx"> bool isSynchronous() const override { return false; }
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(WebCore::ResourceResponse&&) override;
</span></span></pre>
</div>
</div>
</body>
</html>