<!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>[243087] 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/243087">243087</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-18 11:47:43 -0700 (Mon, 18 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: HAR Extension for `serverIPAddress` port number
https://bugs.webkit.org/show_bug.cgi?id=195695

Reviewed by Matt Baker.

Source/WebInspectorUI:

* UserInterface/Controllers/HARBuilder.js:
(WI.HARBuilder.entry):
(WI.HARBuilder.port):
* UserInterface/Models/LocalResource.js:
(WI.LocalResource.fromHAREntry):

LayoutTests:

* http/tests/inspector/network/har/har-basic-expected.txt:
* http/tests/inspector/network/har/har-page-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkharharbasicexpectedtxt">trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkharharpageexpectedtxt">trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersHARBuilderjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsLocalResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243086 => 243087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/LayoutTests/ChangeLog 2019-03-18 18:47:43 UTC (rev 243087)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: HAR Extension for `serverIPAddress` port number
+        https://bugs.webkit.org/show_bug.cgi?id=195695
+
+        Reviewed by Matt Baker.
+
+        * http/tests/inspector/network/har/har-basic-expected.txt:
+        * http/tests/inspector/network/har/har-page-expected.txt:
+
+2019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
+
</ins><span class="cx">         Unreviewed test gardening after r243024.
</span><span class="cx"> 
</span><span class="cx">         * inspector/timeline/timeline-recording-expected.txt:
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkharharbasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt (243086 => 243087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt        2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt   2019-03-18 18:47:43 UTC (rev 243087)
</span><span class="lines">@@ -135,6 +135,7 @@
</span><span class="cx">           "receive": 99.99999999999987
</span><span class="cx">         },
</span><span class="cx">         "serverIPAddress": "12.34.56.78",
</span><ins>+        "_serverPort": 443,
</ins><span class="cx">         "connection": "1",
</span><span class="cx">         "_fetchType": "Network Load",
</span><span class="cx">         "_priority": "medium"
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkharharpageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt (243086 => 243087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt    2019-03-18 18:47:43 UTC (rev 243087)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "high"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -104,6 +105,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "high"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -146,6 +148,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "high"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -195,6 +198,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -250,6 +254,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -304,6 +309,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -358,6 +364,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -412,6 +419,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -470,6 +478,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -534,6 +543,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -602,6 +612,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -674,6 +685,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       },
</span><span class="cx">       {
</span><span class="lines">@@ -750,6 +762,7 @@
</span><span class="cx">           "wait": "<filtered>",
</span><span class="cx">           "receive": "<filtered>"
</span><span class="cx">         },
</span><ins>+        "_serverPort": 8000,
</ins><span class="cx">         "_priority": "medium"
</span><span class="cx">       }
</span><span class="cx">     ]
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (243086 => 243087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-03-18 18:47:43 UTC (rev 243087)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: HAR Extension for `serverIPAddress` port number
+        https://bugs.webkit.org/show_bug.cgi?id=195695
+
+        Reviewed by Matt Baker.
+
+        * UserInterface/Controllers/HARBuilder.js:
+        (WI.HARBuilder.entry):
+        (WI.HARBuilder.port):
+        * UserInterface/Models/LocalResource.js:
+        (WI.LocalResource.fromHAREntry):
+
</ins><span class="cx"> 2019-03-16  Nikita Vasilyev  <nvasilyev@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Changes: style attribute changes aren't being tracked
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersHARBuilderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js (243086 => 243087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js      2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js 2019-03-18 18:47:43 UTC (rev 243087)
</span><span class="lines">@@ -105,7 +105,10 @@
</span><span class="cx">             entry.time = (resource.timingData.responseEnd - resource.timingData.startTime) * 1000;
</span><span class="cx">         if (resource.remoteAddress) {
</span><span class="cx">             entry.serverIPAddress = HARBuilder.ipAddress(resource.remoteAddress);
</span><del>-            // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
</del><ins>+
+            // WebKit Custom Field `_serverPort`.
+            if (entry.serverIPAddress)
+                entry._serverPort = HARBuilder.port(resource.remoteAddress);
</ins><span class="cx">         }
</span><span class="cx">         if (resource.connectionIdentifier)
</span><span class="cx">             entry.connection = "" + resource.connectionIdentifier;
</span><span class="lines">@@ -295,6 +298,26 @@
</span><span class="cx">         return remoteAddress.replace(/:\d+$/, "");
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    static port(remoteAddress)
+    {
+        // IP Address, without port.
+        if (!remoteAddress)
+            return undefined;
+
+        // NOTE: Resource.remoteAddress always includes the port at the end.
+        // So this always matches the last part.
+        let index = remoteAddress.lastIndexOf(":");
+        if (!index)
+            return undefined;
+
+        let portString = remoteAddress.substr(index + 1);
+        let port = parseInt(portString);
+        if (isNaN(port))
+            return undefined;
+
+        return port;
+    }
+
</ins><span class="cx">     static date(date)
</span><span class="cx">     {
</span><span class="cx">         // ISO 8601
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsLocalResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js (243086 => 243087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js        2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js   2019-03-18 18:47:43 UTC (rev 243087)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> 
</span><span class="cx">     static fromHAREntry(entry, archiveStartWalltime)
</span><span class="cx">     {
</span><del>-        // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
</del><span class="cx">         // FIXME: <https://webkit.org/b/195694> Web Inspector: HAR Extension for Redirect Timing Info
</span><span class="cx"> 
</span><span class="cx">         let {request, response, startedDateTime, timings} = entry;
</span><span class="lines">@@ -159,6 +158,10 @@
</span><span class="cx">             finishedTimestamp = timing.responseEnd;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        let serverAddress = entry.serverIPAddress || null;
+        if (serverAddress && typeof entry._serverPort === "number")
+            serverAddress += ":" + entry._serverPort;
+
</ins><span class="cx">         return new WI.LocalResource({
</span><span class="cx">             request: {
</span><span class="cx">                 url: request.url,
</span><span class="lines">@@ -182,7 +185,7 @@
</span><span class="cx">                 responseSource: WI.HARBuilder.responseSourceFromHARFetchType(entry._fetchType),
</span><span class="cx">                 protocol: WI.HARBuilder.protocolFromHARProtocol(response.httpVersion),
</span><span class="cx">                 priority: WI.HARBuilder.networkPriorityFromHARPriority(entry._priority),
</span><del>-                remoteAddress: entry.serverIPAddress || null,
</del><ins>+                remoteAddress: serverAddress,
</ins><span class="cx">                 connectionIdentifier: entry.connection ? parseInt(entry.connection) : null,
</span><span class="cx">                 requestHeaderBytesSent: request.headersSize >= 0 ? request.headersSize : NaN,
</span><span class="cx">                 requestBodyBytesSent: request.bodySize >= 0 ? request.bodySize : NaN,
</span></span></pre>
</div>
</div>

</body>
</html>