<!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>[205669] 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/205669">205669</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-08 15:28:48 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should parse ports after IPv4 and IPv6 hosts
https://bugs.webkit.org/show_bug.cgi?id=161731
Reviewed by Brady Eidson.
Source/WebCore:
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parsePort):
(WebCore::URLParser::parseHost):
Tools:
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205668 => 205669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-08 22:16:49 UTC (rev 205668)
+++ trunk/Source/WebCore/ChangeLog 2016-09-08 22:28:48 UTC (rev 205669)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-09-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser should parse ports after IPv4 and IPv6 hosts
+ https://bugs.webkit.org/show_bug.cgi?id=161731
+
+ Reviewed by Brady Eidson.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parsePort):
+ (WebCore::URLParser::parseHost):
+
+2016-09-08 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> URLParser should correctly handle \ in path
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161762
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205668 => 205669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-08 22:16:49 UTC (rev 205668)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-08 22:28:48 UTC (rev 205669)
</span><span class="lines">@@ -1355,7 +1355,11 @@
</span><span class="cx"> bool URLParser::parsePort(StringView::CodePoints::Iterator& iterator, const StringView::CodePoints::Iterator& end)
</span><span class="cx"> {
</span><span class="cx"> uint32_t port = 0;
</span><del>- ASSERT(iterator != end);
</del><ins>+ if (iterator == end) {
+ m_url.m_portEnd = m_buffer.length();
+ return true;
+ }
+ m_buffer.append(':');
</ins><span class="cx"> for (; iterator != end; ++iterator) {
</span><span class="cx"> if (isTabOrNewline(*iterator))
</span><span class="cx"> continue;
</span><span class="lines">@@ -1375,6 +1379,7 @@
</span><span class="cx"> } else
</span><span class="cx"> m_buffer.appendNumber(port);
</span><span class="cx">
</span><ins>+ m_url.m_portEnd = m_buffer.length();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1390,8 +1395,15 @@
</span><span class="cx"> if (auto address = parseIPv6Host(iterator, ipv6End)) {
</span><span class="cx"> serializeIPv6(address.value(), m_buffer);
</span><span class="cx"> m_url.m_hostEnd = m_buffer.length();
</span><del>- // FIXME: Handle the port correctly.
- m_url.m_portEnd = m_buffer.length();
</del><ins>+ if (ipv6End != end) {
+ ++ipv6End;
+ if (ipv6End != end && *ipv6End == ':') {
+ ++ipv6End;
+ return parsePort(ipv6End, end);
+ }
+ m_url.m_portEnd = m_buffer.length();
+ return true;
+ }
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1421,9 +1433,12 @@
</span><span class="cx"> if (auto address = parseIPv4Host(asciiDomainCodePoints.begin(), asciiDomainCodePoints.end())) {
</span><span class="cx"> serializeIPv4(address.value(), m_buffer);
</span><span class="cx"> m_url.m_hostEnd = m_buffer.length();
</span><del>- // FIXME: Handle the port correctly.
- m_url.m_portEnd = m_buffer.length();
- return true;
</del><ins>+ if (iterator == end) {
+ m_url.m_portEnd = m_buffer.length();
+ return true;
+ }
+ ++iterator;
+ return parsePort(iterator, end);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_buffer.append(asciiDomain.value());
</span><span class="lines">@@ -1433,11 +1448,7 @@
</span><span class="cx"> ++iterator;
</span><span class="cx"> while (iterator != end && isTabOrNewline(*iterator))
</span><span class="cx"> ++iterator;
</span><del>- if (iterator != end) {
- m_buffer.append(':');
- if (!parsePort(iterator, end))
- return false;
- }
</del><ins>+ return parsePort(iterator, end);
</ins><span class="cx"> }
</span><span class="cx"> m_url.m_portEnd = m_buffer.length();
</span><span class="cx"> return true;
</span><span class="lines">@@ -1497,7 +1508,7 @@
</span><span class="cx">
</span><span class="cx"> bool URLParser::enabled()
</span><span class="cx"> {
</span><del>- return urlParserEnabled;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205668 => 205669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-08 22:16:49 UTC (rev 205668)
+++ trunk/Tools/ChangeLog 2016-09-08 22:28:48 UTC (rev 205669)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-09-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser should parse ports after IPv4 and IPv6 hosts
+ https://bugs.webkit.org/show_bug.cgi?id=161731
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2016-09-08 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> URLParser should correctly handle \ in path
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161762
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205668 => 205669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-08 22:16:49 UTC (rev 205668)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-08 22:28:48 UTC (rev 205669)
</span><span class="lines">@@ -179,6 +179,19 @@
</span><span class="cx"> checkURL("http://host/a%20B", {"http", "", "", "host", 0, "/a%20B", "", "", "http://host/a%20B"});
</span><span class="cx"> checkURL("http://host?q=@ <>!#fragment", {"http", "", "", "host", 0, "/", "q=@%20%3C%3E!", "fragment", "http://host/?q=@%20%3C%3E!#fragment"});
</span><span class="cx"> checkURL("http://user:@host", {"http", "user", "", "host", 0, "/", "", "", "http://user@host/"});
</span><ins>+ checkURL("http://127.0.0.1:10100/path", {"http", "", "", "127.0.0.1", 10100, "/path", "", "", "http://127.0.0.1:10100/path"});
+ checkURL("http://127.0.0.1:/path", {"http", "", "", "127.0.0.1", 0, "/path", "", "", "http://127.0.0.1/path"});
+ checkURL("http://127.0.0.1:123", {"http", "", "", "127.0.0.1", 123, "/", "", "", "http://127.0.0.1:123/"});
+ checkURL("http://127.0.0.1:", {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"});
+ checkURL("http://[0:f::f:f:0:0]:123/path", {"http", "", "", "[0:f::f:f:0:0]", 123, "/path", "", "", "http://[0:f::f:f:0:0]:123/path"});
+ checkURL("http://[0:f::f:f:0:0]:123", {"http", "", "", "[0:f::f:f:0:0]", 123, "/", "", "", "http://[0:f::f:f:0:0]:123/"});
+ checkURL("http://[0:f::f:f:0:0]:/path", {"http", "", "", "[0:f::f:f:0:0]", 0, "/path", "", "", "http://[0:f::f:f:0:0]/path"});
+ checkURL("http://[0:f::f:f:0:0]:", {"http", "", "", "[0:f::f:f:0:0]", 0, "/", "", "", "http://[0:f::f:f:0:0]/"});
+ checkURL("http://host:10100/path", {"http", "", "", "host", 10100, "/path", "", "", "http://host:10100/path"});
+ checkURL("http://host:/path", {"http", "", "", "host", 0, "/path", "", "", "http://host/path"});
+ checkURL("http://host:123", {"http", "", "", "host", 123, "/", "", "", "http://host:123/"});
+ checkURL("http://host:", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
+ checkURL("http://hos\tt\n:\t1\n2\t3\t/\npath", {"http", "", "", "host", 123, "/path", "", "", "http://host:123/path"});
</ins><span class="cx">
</span><span class="cx"> // This disagrees with the web platform test for http://:@www.example.com but agrees with Chrome and URL::parse,
</span><span class="cx"> // and Firefox fails the web platform test differently. Maybe the web platform test ought to be changed.
</span><span class="lines">@@ -372,6 +385,27 @@
</span><span class="cx"> checkRelativeURLDifferences("//", "https://www.webkit.org/path",
</span><span class="cx"> {"", "", "", "", 0, "", "", "", ""},
</span><span class="cx"> {"https", "", "", "", 0, "/", "", "", "https:/"});
</span><ins>+ checkURLDifferences("http://127.0.0.1:65536/path",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"http", "", "", "127.0.0.1", 65535, "/path", "", "", "http://127.0.0.1:65536/path"});
+ checkURLDifferences("http://host:abc",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://host:abc"});
+ checkURLDifferences("http://host:65536",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"http", "", "", "host", 65535, "/", "", "", "http://host:65536/"});
+ checkURLDifferences("http://127.0.0.1:abc",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://127.0.0.1:abc"});
+ checkURLDifferences("http://127.0.0.1:65536",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"http", "", "", "127.0.0.1", 65535, "/", "", "", "http://127.0.0.1:65536/"});
+ checkURLDifferences("http://[0:f::f:f:0:0]:abc",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://[0:f::f:f:0:0]:abc"});
+ checkURLDifferences("http://[0:f::f:f:0:0]:65536",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"http", "", "", "[0:f::f:f:0:0]", 65535, "/", "", "", "http://[0:f::f:f:0:0]:65536/"});
</ins><span class="cx">
</span><span class="cx"> // This behavior matches Chrome and Firefox, but not WebKit using URL::parse.
</span><span class="cx"> // The behavior of URL::parse is clearly wrong because reparsing file://path would make path the host.
</span></span></pre>
</div>
</div>
</body>
</html>