<!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>[208086] 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/208086">208086</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-28 17:17:01 -0700 (Fri, 28 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should not try to interpret host of URLs with unrecognized schemes as IPv4 address
https://bugs.webkit.org/show_bug.cgi?id=164154
Reviewed by Andy Estes.
Source/WebCore:
This is needed to match behavior of all browsers.
This is being discussed in the spec at https://github.com/whatwg/url/issues/148
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parseHostAndPort):
Only try to parse and canonicalize the host as an IPv4 address if the scheme is special (http, wss, etc.)
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 (208085 => 208086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-29 00:14:37 UTC (rev 208085)
+++ trunk/Source/WebCore/ChangeLog        2016-10-29 00:17:01 UTC (rev 208086)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-28 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should not try to interpret host of URLs with unrecognized schemes as IPv4 address
+ https://bugs.webkit.org/show_bug.cgi?id=164154
+
+ Reviewed by Andy Estes.
+
+ This is needed to match behavior of all browsers.
+ This is being discussed in the spec at https://github.com/whatwg/url/issues/148
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parseHostAndPort):
+ Only try to parse and canonicalize the host as an IPv4 address if the scheme is special (http, wss, etc.)
+
</ins><span class="cx"> 2016-10-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> DOMStringMap reports properties as non-enumerable
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (208085 => 208086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp        2016-10-29 00:14:37 UTC (rev 208085)
+++ trunk/Source/WebCore/platform/URLParser.cpp        2016-10-29 00:17:01 UTC (rev 208086)
</span><span class="lines">@@ -2572,25 +2572,28 @@
</span><span class="cx"> if (isInvalidDomainCharacter(*iterator))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- if (auto address = parseIPv4Host(CodePointIterator<CharacterType>(hostIterator, iterator))) {
- serializeIPv4(address.value());
- m_url.m_hostEnd = currentPosition(iterator);
- if (iterator.atEnd()) {
- m_url.m_portEnd = currentPosition(iterator);
- return true;
</del><ins>+ if (m_urlIsSpecial) {
+ if (auto address = parseIPv4Host(CodePointIterator<CharacterType>(hostIterator, iterator))) {
+ serializeIPv4(address.value());
+ m_url.m_hostEnd = currentPosition(iterator);
+ if (iterator.atEnd()) {
+ m_url.m_portEnd = currentPosition(iterator);
+ return true;
+ }
+ return parsePort(iterator);
</ins><span class="cx"> }
</span><del>- return parsePort(iterator);
</del><span class="cx"> }
</span><span class="cx"> for (; hostIterator != iterator; ++hostIterator) {
</span><del>- if (LIKELY(!isTabOrNewline(*hostIterator))) {
- if (m_urlIsSpecial) {
- if (UNLIKELY(isASCIIUpper(*hostIterator)))
- syntaxViolation(hostIterator);
- appendToASCIIBuffer(toASCIILower(*hostIterator));
- } else
- appendToASCIIBuffer(*hostIterator);
</del><ins>+ if (UNLIKELY(isTabOrNewline(*hostIterator))) {
+ syntaxViolation(hostIterator);
+ continue;
+ }
+ if (m_urlIsSpecial) {
+ if (UNLIKELY(isASCIIUpper(*hostIterator)))
+ syntaxViolation(hostIterator);
+ appendToASCIIBuffer(toASCIILower(*hostIterator));
</ins><span class="cx"> } else
</span><del>- syntaxViolation(hostIterator);
</del><ins>+ appendToASCIIBuffer(*hostIterator);
</ins><span class="cx"> }
</span><span class="cx"> m_url.m_hostEnd = currentPosition(iterator);
</span><span class="cx"> if (!hostIterator.atEnd())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208085 => 208086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-10-29 00:14:37 UTC (rev 208085)
+++ trunk/Tools/ChangeLog        2016-10-29 00:17:01 UTC (rev 208086)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-28 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should not try to interpret host of URLs with unrecognized schemes as IPv4 address
+ https://bugs.webkit.org/show_bug.cgi?id=164154
+
+ Reviewed by Andy Estes.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-10-28 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Update parser and code generators to only access type information through the type property
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (208085 => 208086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-10-29 00:14:37 UTC (rev 208085)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-10-29 00:17:01 UTC (rev 208086)
</span><span class="lines">@@ -949,6 +949,14 @@
</span><span class="cx"> checkURLDifferences("http://[a:b:c:d:e:f::127.0.0.256]",
</span><span class="cx"> {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f::127.0.0.256]"},
</span><span class="cx"> {"http", "", "", "[a:b:c:d:e:f::127.0.0.256]", 0, "/", "", "", "http://[a:b:c:d:e:f::127.0.0.256]/"});
</span><ins>+ checkURLDifferences("http://123456", {"http", "", "", "0.1.226.64", 0, "/", "", "", "http://0.1.226.64/"}, {"http", "", "", "123456", 0, "/", "", "", "http://123456/"});
+ checkURL("asdf://123456", {"asdf", "", "", "123456", 0, "", "", "", "asdf://123456"});
+ checkURLDifferences("http://[0:0:0:0:a:b:c:d]",
+ {"http", "", "", "[::a:b:c:d]", 0, "/", "", "", "http://[::a:b:c:d]/"},
+ {"http", "", "", "[0:0:0:0:a:b:c:d]", 0, "/", "", "", "http://[0:0:0:0:a:b:c:d]/"});
+ checkURLDifferences("asdf://[0:0:0:0:a:b:c:d]",
+ {"asdf", "", "", "[::a:b:c:d]", 0, "", "", "", "asdf://[::a:b:c:d]"},
+ {"asdf", "", "", "[0:0:0:0:a:b:c:d]", 0, "", "", "", "asdf://[0:0:0:0:a:b:c:d]"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span><span class="lines">@@ -1105,6 +1113,7 @@
</span><span class="cx"> shouldFail("http://[a:b:c:d:e:f:127.0.0.0x11]"); // Chrome treats this as hex, Firefox and the spec fail
</span><span class="cx"> shouldFail("http://[a:b:c:d:e:f:127.0.-0.1]");
</span><span class="cx"> shouldFail("asdf://space InHost");
</span><ins>+ shouldFail("asdf://[0:0:0:0:a:b:c:d");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // These are in the spec but not in the web platform tests.
</span></span></pre>
</div>
</div>
</body>
</html>