<!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>[215062] 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/215062">215062</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-06 15:02:04 -0700 (Thu, 06 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
https://bugs.webkit.org/show_bug.cgi?id=16531
<rdar://problem/5712895>
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/protocol/Network.json:
Optional refined list of request headers in Metrics.
Source/WebCore:
Test: http/tests/inspector/network/resource-request-headers.html
* loader/ResourceTiming.cpp:
(WebCore::ResourceTiming::ResourceTiming):
Eliminate unnecessary data from the NetworkLoadTiming object
when it is used for ResourceTiming. This clears up some memory
that will otherwise never be used.
* platform/network/NetworkLoadMetrics.h:
(WebCore::NetworkLoadMetrics::isolatedCopy):
(WebCore::NetworkLoadMetrics::reset):
(WebCore::NetworkLoadMetrics::clearNonTimingData):
(WebCore::NetworkLoadMetrics::operator==):
(WebCore::NetworkLoadMetrics::encode):
(WebCore::NetworkLoadMetrics::decode):
Include an optional HTTPHeaderMap for a refined list of
request headers for this network load.
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::buildObjectForMetrics):
Include request headers with other optional metrics data
when the load is completed.
Source/WebInspectorUI:
* UserInterface/Models/Resource.js:
(WebInspector.Resource.prototype.updateWithMetrics):
Update request headers if provided in metrics.
Source/WebKit2:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
Include a complete list of the request headers sent for this load.
There may be headers that WebCore did not know about and developer
tools should be informed of.
LayoutTests:
* http/tests/inspector/network/resource-request-headers-expected.txt: Added.
* http/tests/inspector/network/resource-request-headers.html: Added.
* http/tests/inspector/network/resources/basic-auth.php: Added.
Test coverage for Cookie and Basic Authentication headers.
* platform/mac/TestExpectations:
* platform/mac-wk1/TestExpectations:
* platform/win/TestExpectations:
Mark the test as expected to fail on WebKit1 CFNetwork based platforms,
and ElCapitan which uses the legacy non-NSURLSession loading path.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolNetworkjson">trunk/Source/JavaScriptCore/inspector/protocol/Network.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceTimingcpp">trunk/Source/WebCore/loader/ResourceTiming.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkLoadMetricsh">trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkresourcerequestheadersexpectedtxt">trunk/LayoutTests/http/tests/inspector/network/resource-request-headers-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkresourcerequestheadershtml">trunk/LayoutTests/http/tests/inspector/network/resource-request-headers.html</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkresourcesbasicauthphp">trunk/LayoutTests/http/tests/inspector/network/resources/basic-auth.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/LayoutTests/ChangeLog 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=16531
+ <rdar://problem/5712895>
+
+ Reviewed by Timothy Hatcher.
+
+ * http/tests/inspector/network/resource-request-headers-expected.txt: Added.
+ * http/tests/inspector/network/resource-request-headers.html: Added.
+ * http/tests/inspector/network/resources/basic-auth.php: Added.
+ Test coverage for Cookie and Basic Authentication headers.
+
+ * platform/mac/TestExpectations:
+ * platform/mac-wk1/TestExpectations:
+ * platform/win/TestExpectations:
+ Mark the test as expected to fail on WebKit1 CFNetwork based platforms,
+ and ElCapitan which uses the legacy non-NSURLSession loading path.
+
</ins><span class="cx"> 2017-04-06 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> LayoutTest fast/mediastream/getUserMedia-webaudio.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkresourcerequestheadersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/resource-request-headers-expected.txt (0 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/resource-request-headers-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/resource-request-headers-expected.txt 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+Test for Resource request headers which may not have been immediately available but eventually are (Cookie, Authorization).
+
+
+== Running test suite: Resource.Metrics.RequestHeaders
+-- Running test case: Resource.Metrics.RequestHeaders.WithoutCookie
+PASS: Resource should be created.
+PASS: Resource should receive a Response.
+PASS: Request should not have a 'Cookie' header.
+
+-- Running test case: Resource.Metrics.RequestHeaders.WithCookie
+PASS: Resource should be created.
+PASS: Resource should receive a Response.
+PASS: 'Cookie' header value should be `InspectorTestCookie=1234`.
+
+-- Running test case: Resource.Metrics.RequestHeaders.BasicAuth.None
+PASS: Resource should be created.
+PASS: Resource should receive a Response.
+PASS: Resource should have a 401 status code.
+PASS: Response should have a 'WWW-Authenticate' response header for the failure.
+PASS: Request should not have a 'Authorization' header.
+
+-- Running test case: Resource.Metrics.RequestHeaders.BasicAuth.Failure
+PASS: Resource should be created.
+PASS: Resource should receive a Response.
+PASS: Resource should have a 401 status code.
+PASS: Response should have a 'WWW-Authenticate' response header for the failure.
+FAIL: 'Authorization' header value should be for badUsername:badPassword.
+ Expected: "Basic YmFkVXNlcm5hbWU6YmFkUGFzc3dvcmQ="
+ Actual: undefined
+
+-- Running test case: Resource.Metrics.RequestHeaders.BasicAuth.Success
+PASS: Resource should be created.
+PASS: Resource should receive a Response.
+PASS: Resource should have a 200 status code.
+PASS: 'Authorization' header value should be for goodUsername:goodPassword.
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkresourcerequestheadershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/resource-request-headers.html (0 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/resource-request-headers.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/resource-request-headers.html 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -0,0 +1,124 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/inspector-test.js"></script>
+<script>
+function triggerNetworkLoad() {
+ let url = "resources/data.json?" + Math.random();
+ fetch(url, {credentials: "same-origin"}).then(() => {
+ TestPage.dispatchEventToFrontend("LoadComplete");
+ });
+}
+
+function triggerNetworkLoadWithBasicAuthentication(username, password) {
+ let xhr = new XMLHttpRequest();
+ xhr.open("GET", "resources/basic-auth.php?" + Math.random(), true, username, password);
+ xhr.onload = xhr.onerror = () => { TestPage.dispatchEventToFrontend("LoadComplete"); };
+ xhr.send();
+}
+
+function triggerNetworkLoadWithoutCookie() {
+ document.cookie = "InspectorTestCookie=;expires=Thu, 01 Jan 1970 00:00:01 GMT;";
+ triggerNetworkLoad();
+}
+
+function triggerNetworkLoadWithCookie() {
+ document.cookie = "InspectorTestCookie=1234";
+ triggerNetworkLoad();
+}
+
+function triggerNetworkLoadWithoutBasicAuthentication() {
+ triggerNetworkLoadWithBasicAuthentication(undefined, undefined);
+}
+
+function triggerNetworkLoadWithBasicAuthenticationFailure() {
+ triggerNetworkLoadWithBasicAuthentication("badUsername", "badPassword");
+}
+
+function triggerNetworkLoadWithBasicAuthenticationSuccess() {
+ triggerNetworkLoadWithBasicAuthentication("goodUsername", "goodPassword");
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Resource.Metrics.RequestHeaders");
+
+ function addTestCase({name, description, expression, status, loadHandler}) {
+ suite.addTestCase({
+ name, description,
+ test(resolve, reject) {
+ InspectorTest.evaluateInPage(expression);
+ Promise.all([
+ WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded),
+ WebInspector.Resource.awaitEvent(WebInspector.Resource.Event.ResponseReceived),
+ InspectorTest.awaitEvent("LoadComplete"),
+ ]).then(([resourceWasAddedEvent, responseReceivedEvent, loadCompleteEvent]) => {
+ let resource = resourceWasAddedEvent.data.resource;
+ InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
+ InspectorTest.expectEqual(resource, responseReceivedEvent.target, "Resource should receive a Response.");
+ return loadHandler(resource);
+ }).then(resolve, reject);
+ }
+ });
+ }
+
+ addTestCase({
+ name: "Resource.Metrics.RequestHeaders.WithoutCookie",
+ description: "Load a resource from the network without Cookies, we should not see any Cookie headers.",
+ expression: `triggerNetworkLoadWithoutCookie()`,
+ loadHandler(resource) {
+ InspectorTest.expectThat(!resource.requestHeaders.valueForCaseInsensitiveKey("Cookie"), "Request should not have a 'Cookie' header.");
+ }
+ });
+
+ addTestCase({
+ name: "Resource.Metrics.RequestHeaders.WithCookie",
+ description: "Load a resource from the network with Cookies, we should be able to see Cookie headers.",
+ expression: `triggerNetworkLoadWithCookie()`,
+ loadHandler(resource) {
+ InspectorTest.expectEqual(resource.requestHeaders.valueForCaseInsensitiveKey("Cookie"), "InspectorTestCookie=1234", "'Cookie' header value should be `InspectorTestCookie=1234`.");
+ }
+ });
+
+ addTestCase({
+ name: "Resource.Metrics.RequestHeaders.BasicAuth.None",
+ description: "Load a resource from the network without authentication, we should not be able to see Basic Authorization headers.",
+ expression: `triggerNetworkLoadWithoutBasicAuthentication()`,
+ loadHandler(resource) {
+ InspectorTest.expectEqual(resource.statusCode, 401, "Resource should have a 401 status code.");
+ InspectorTest.expectThat(resource.responseHeaders.valueForCaseInsensitiveKey("WWW-Authenticate"), "Response should have a 'WWW-Authenticate' response header for the failure.");
+ InspectorTest.expectThat(!resource.requestHeaders.valueForCaseInsensitiveKey("Authorization"), "Request should not have a 'Authorization' header.");
+ }
+ });
+
+ addTestCase({
+ name: "Resource.Metrics.RequestHeaders.BasicAuth.Failure",
+ description: "Load a resource from the network with authentication, we should be able to see Basic Authorization headers.",
+ expression: `triggerNetworkLoadWithBasicAuthenticationFailure()`,
+ loadHandler(resource) {
+ InspectorTest.expectEqual(resource.statusCode, 401, "Resource should have a 401 status code.");
+ InspectorTest.expectThat(resource.responseHeaders.valueForCaseInsensitiveKey("WWW-Authenticate"), "Response should have a 'WWW-Authenticate' response header for the failure.");
+ // FIXME: <https://webkit.org/b/170489> Web Inspector: Include NetworkLoadMetrics with failed loads
+ InspectorTest.expectEqual(resource.requestHeaders.valueForCaseInsensitiveKey("Authorization"), "Basic YmFkVXNlcm5hbWU6YmFkUGFzc3dvcmQ=", "'Authorization' header value should be for badUsername:badPassword.");
+ }
+ });
+
+ addTestCase({
+ name: "Resource.Metrics.RequestHeaders.BasicAuth.Success",
+ description: "Load a resource from the network with authentication, we should be able to see Basic Authorization headers.",
+ expression: `triggerNetworkLoadWithBasicAuthenticationSuccess()`,
+ loadHandler(resource) {
+ InspectorTest.expectEqual(resource.statusCode, 200, "Resource should have a 200 status code.");
+ InspectorTest.expectEqual(resource.requestHeaders.valueForCaseInsensitiveKey("Authorization"), "Basic Z29vZFVzZXJuYW1lOmdvb2RQYXNzd29yZA==", "'Authorization' header value should be for goodUsername:goodPassword.");
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Test for Resource request headers which may not have been immediately available but eventually are (Cookie, Authorization).</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkresourcesbasicauthphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/resources/basic-auth.php (0 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/resources/basic-auth.php (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/resources/basic-auth.php 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<?php
+$expectedUsername = "goodUsername";
+$expectedPassword = "goodPassword";
+$realm = $_SERVER["REQUEST_URI"];
+
+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 "Bad username:password (" . $_SERVER['PHP_AUTH_USER'] . ":" . $_SERVER["PHP_AUTH_PW"] . ")";
+ exit;
+}
+?>
+Success
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -1535,10 +1535,13 @@
</span><span class="cx"> webkit.org/b/168415 [ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-cors.html [ Skip ]
</span><span class="cx"> webkit.org/b/168415 [ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.html [ Skip ]
</span><span class="cx">
</span><del>-# Resource Timing networking data not yet available without Network Session.
</del><ins>+# Resource Timing networking data not available without Network Session.
</ins><span class="cx"> [ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Failure ]
</span><span class="cx"> [ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
</span><span class="cx">
</span><ins>+# Request Header networking data not available without Network Session.
+[ ElCapitan ] http/tests/inspector/network/resource-request-headers.html [ Failure ]
+
</ins><span class="cx"> # <rdar://problem/30610988>
</span><span class="cx"> [ Sierra+ ] imported/w3c/web-platform-tests/fetch/api/redirect/redirect-count-cross-origin-worker.html [ Failure ]
</span><span class="cx"> [ Sierra+ ] imported/w3c/web-platform-tests/fetch/api/redirect/redirect-count-cross-origin.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -309,6 +309,9 @@
</span><span class="cx"> imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
</span><span class="cx">
</span><ins>+# Request Header information only available in WebKit2
+http/tests/inspector/network/resource-request-headers.html [ Failure ]
+
</ins><span class="cx"> webkit.org/b/164491 [ Yosemite ElCapitan ] fast/visual-viewport/rtl-zoomed-rects.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/164933 http/tests/misc/link-rel-icon-beforeload.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/LayoutTests/platform/win/TestExpectations 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -3796,6 +3796,9 @@
</span><span class="cx"> imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
</span><span class="cx">
</span><ins>+# Request Header information only available in WebKit2
+http/tests/inspector/network/resource-request-headers.html [ Failure ]
+
</ins><span class="cx"> # WebCrypto tests are failing.
</span><span class="cx"> webkit.org/b/165090 imported/w3c/WebCryptoAPI [ Skip ]
</span><span class="cx"> webkit.org/b/165090 imported/w3c/web-platform-tests/WebCryptoAPI [ Skip ]
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=16531
+ <rdar://problem/5712895>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/Network.json:
+ Optional refined list of request headers in Metrics.
+
</ins><span class="cx"> 2017-04-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3 -O1 should generate better code than -O0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolNetworkjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Network.json (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Network.json 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Network.json 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -84,7 +84,8 @@
</span><span class="cx"> { "name": "protocol", "type": "string", "optional": true, "description": "Network protocol. ALPN Protocol ID Identification Sequence, as per RFC 7301 (for example, http/2, http/1.1, spdy/3.1)" },
</span><span class="cx"> { "name": "priority", "type": "string", "enum": ["low", "medium", "high"], "optional": true, "description": "Network priority." },
</span><span class="cx"> { "name": "connectionIdentifier", "type": "string", "optional": true, "description": "Connection identifier." },
</span><del>- { "name": "remoteAddress", "type": "string", "optional": true, "description": "Remote IP address." }
</del><ins>+ { "name": "remoteAddress", "type": "string", "optional": true, "description": "Remote IP address." },
+ { "name": "requestHeaders", "$ref": "Headers", "optional": true, "description": "Refined HTTP request headers that were actually transmitted over the network." }
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebCore/ChangeLog 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=16531
+ <rdar://problem/5712895>
+
+ Reviewed by Timothy Hatcher.
+
+ Test: http/tests/inspector/network/resource-request-headers.html
+
+ * loader/ResourceTiming.cpp:
+ (WebCore::ResourceTiming::ResourceTiming):
+ Eliminate unnecessary data from the NetworkLoadTiming object
+ when it is used for ResourceTiming. This clears up some memory
+ that will otherwise never be used.
+
+ * platform/network/NetworkLoadMetrics.h:
+ (WebCore::NetworkLoadMetrics::isolatedCopy):
+ (WebCore::NetworkLoadMetrics::reset):
+ (WebCore::NetworkLoadMetrics::clearNonTimingData):
+ (WebCore::NetworkLoadMetrics::operator==):
+ (WebCore::NetworkLoadMetrics::encode):
+ (WebCore::NetworkLoadMetrics::decode):
+ Include an optional HTTPHeaderMap for a refined list of
+ request headers for this network load.
+
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::buildObjectForMetrics):
+ Include request headers with other optional metrics data
+ when the load is completed.
+
</ins><span class="cx"> 2017-04-06 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Follow up to r209304, remove line numbers from one more StyleRule construction
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -223,6 +223,8 @@
</span><span class="cx"> metrics->setRemoteAddress(*networkLoadMetrics.remoteAddress);
</span><span class="cx"> if (networkLoadMetrics.connectionIdentifier)
</span><span class="cx"> metrics->setConnectionIdentifier(*networkLoadMetrics.connectionIdentifier);
</span><ins>+ if (networkLoadMetrics.requestHeaders)
+ metrics->setRequestHeaders(buildObjectForHeaders(*networkLoadMetrics.requestHeaders));
</ins><span class="cx">
</span><span class="cx"> return metrics;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceTiming.cpp (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceTiming.cpp 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebCore/loader/ResourceTiming.cpp 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> , m_networkLoadMetrics(networkLoadMetrics)
</span><span class="cx"> , m_allowTimingDetails(passesTimingAllowCheck(resource.response(), securityOrigin))
</span><span class="cx"> {
</span><ins>+ m_networkLoadMetrics.clearNonTimingData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceTiming::ResourceTiming(const URL& url, const String& initiator, const LoadTiming& loadTiming, const NetworkLoadMetrics& networkLoadMetrics, const ResourceResponse& response, const SecurityOrigin& securityOrigin)
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx"> , m_networkLoadMetrics(networkLoadMetrics)
</span><span class="cx"> , m_allowTimingDetails(passesTimingAllowCheck(response, securityOrigin))
</span><span class="cx"> {
</span><ins>+ m_networkLoadMetrics.clearNonTimingData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceTiming ResourceTiming::isolatedCopy() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkLoadMetricsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "HTTPHeaderMap.h"
</ins><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/Seconds.h>
</span><span class="cx"> #include <wtf/persistence/Decoder.h>
</span><span class="lines">@@ -72,6 +73,8 @@
</span><span class="cx"> copy.connectionIdentifier = connectionIdentifier.value().isolatedCopy();
</span><span class="cx"> if (priority)
</span><span class="cx"> copy.priority = *priority;
</span><ins>+ if (requestHeaders)
+ copy.requestHeaders = requestHeaders.value().isolatedCopy();
</ins><span class="cx">
</span><span class="cx"> return copy;
</span><span class="cx"> }
</span><span class="lines">@@ -91,8 +94,17 @@
</span><span class="cx"> remoteAddress = std::nullopt;
</span><span class="cx"> connectionIdentifier = std::nullopt;
</span><span class="cx"> priority = std::nullopt;
</span><ins>+ requestHeaders = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ void clearNonTimingData()
+ {
+ remoteAddress = std::nullopt;
+ connectionIdentifier = std::nullopt;
+ priority = std::nullopt;
+ requestHeaders = std::nullopt;
+ }
+
</ins><span class="cx"> bool operator==(const NetworkLoadMetrics& other) const
</span><span class="cx"> {
</span><span class="cx"> return domainLookupStart == other.domainLookupStart
</span><span class="lines">@@ -107,7 +119,8 @@
</span><span class="cx"> && protocol == other.protocol
</span><span class="cx"> && remoteAddress == other.remoteAddress
</span><span class="cx"> && connectionIdentifier == other.connectionIdentifier
</span><del>- && priority == other.priority;
</del><ins>+ && priority == other.priority
+ && requestHeaders == other.requestHeaders;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator!=(const NetworkLoadMetrics& other) const
</span><span class="lines">@@ -141,6 +154,7 @@
</span><span class="cx"> std::optional<String> remoteAddress;
</span><span class="cx"> std::optional<String> connectionIdentifier;
</span><span class="cx"> std::optional<NetworkLoadPriority> priority;
</span><ins>+ std::optional<HTTPHeaderMap> requestHeaders;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -167,6 +181,7 @@
</span><span class="cx"> encoder << remoteAddress;
</span><span class="cx"> encoder << connectionIdentifier;
</span><span class="cx"> encoder << priority;
</span><ins>+ encoder << requestHeaders;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class Decoder>
</span><span class="lines">@@ -184,7 +199,8 @@
</span><span class="cx"> && decoder.decode(metrics.protocol)
</span><span class="cx"> && decoder.decode(metrics.remoteAddress)
</span><span class="cx"> && decoder.decode(metrics.connectionIdentifier)
</span><del>- && decoder.decode(metrics.priority);
</del><ins>+ && decoder.decode(metrics.priority)
+ && decoder.decode(metrics.requestHeaders);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=16531
+ <rdar://problem/5712895>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/Resource.js:
+ (WebInspector.Resource.prototype.updateWithMetrics):
+ Update request headers if provided in metrics.
+
</ins><span class="cx"> 2017-04-06 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Reorder Debugger tab sidebar panels: Scope Chain, Resource, Probes
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -602,6 +602,10 @@
</span><span class="cx"> this._remoteAddress = metrics.remoteAddress;
</span><span class="cx"> if (metrics.connectionIdentifier)
</span><span class="cx"> this._connectionIdentifier = WebInspector.Resource.connectionIdentifierFromPayload(metrics.connectionIdentifier);
</span><ins>+ if (metrics.requestHeaders) {
+ this._requestHeaders = metrics.requestHeaders;
+ this.dispatchEventToListeners(WebInspector.Resource.Event.RequestHeadersDidChange);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> requestContentFromBackend()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=16531
+ <rdar://problem/5712895>
+
+ Reviewed by Timothy Hatcher.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+ Include a complete list of the request headers sent for this load.
+ There may be headers that WebCore did not know about and developer
+ tools should be informed of.
+
</ins><span class="cx"> 2017-04-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> OptionSet options need to be powers of two
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (215061 => 215062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-04-06 21:56:59 UTC (rev 215061)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-04-06 22:02:04 UTC (rev 215062)
</span><span class="lines">@@ -307,6 +307,12 @@
</span><span class="cx"> if ([m respondsToSelector:@selector(_connectionIdentifier)])
</span><span class="cx"> networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
</span><span class="cx"> #endif
</span><ins>+
+ __block WebCore::HTTPHeaderMap requestHeaders;
+ [m.request.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSString *value, BOOL *) {
+ requestHeaders.set(String(name), String(value));
+ }];
+ networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>