<!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>[206783] 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/206783">206783</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-04 14:20:54 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should match URL::parse and other browsers when parsing a URL containing only scheme://
https://bugs.webkit.org/show_bug.cgi?id=162909
Reviewed by Tim Horton.
Source/WebCore:
If there's no host in this case we shouldn't fail, but rather make a valid URL with the // in the path.
This matches Chrome, Firefox, and Safari's behavior.
Covered by API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
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 (206782 => 206783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-04 21:13:18 UTC (rev 206782)
+++ trunk/Source/WebCore/ChangeLog 2016-10-04 21:20:54 UTC (rev 206783)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-04 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should match URL::parse and other browsers when parsing a URL containing only scheme://
+ https://bugs.webkit.org/show_bug.cgi?id=162909
+
+ Reviewed by Tim Horton.
+
+ If there's no host in this case we shouldn't fail, but rather make a valid URL with the // in the path.
+ This matches Chrome, Firefox, and Safari's behavior.
+ Covered by API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+
</ins><span class="cx"> 2016-10-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after r206773.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206782 => 206783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-04 21:13:18 UTC (rev 206782)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-04 21:20:54 UTC (rev 206783)
</span><span class="lines">@@ -1400,17 +1400,32 @@
</span><span class="cx"> }
</span><span class="cx"> bool isSlash = *c == '/' || (m_urlIsSpecial && *c == '\\');
</span><span class="cx"> if (isSlash || *c == '?' || *c == '#') {
</span><del>- m_url.m_userEnd = currentPosition(authorityOrHostBegin);
- m_url.m_passwordEnd = m_url.m_userEnd;
- if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
- failure();
- return;
</del><ins>+ auto iterator = CodePointIterator<CharacterType>(authorityOrHostBegin, c);
+ if (iterator.atEnd()) {
+ size_t position = currentPosition(c);
+ ASSERT(m_url.m_userStart == position);
+ RELEASE_ASSERT(position >= 2);
+ position -= 2;
+ ASSERT(parsedDataView(position, 2) == "//");
+ m_url.m_userStart = position;
+ m_url.m_userEnd = position;
+ m_url.m_passwordEnd = position;
+ m_url.m_hostEnd = position;
+ m_url.m_portEnd = position;
+ m_url.m_pathAfterLastSlash = position + 2;
+ } else {
+ m_url.m_userEnd = currentPosition(authorityOrHostBegin);
+ m_url.m_passwordEnd = m_url.m_userEnd;
+ if (!parseHostAndPort(iterator)) {
+ failure();
+ return;
+ }
+ if (UNLIKELY(!isSlash)) {
+ syntaxViolation(c);
+ appendToASCIIBuffer('/');
+ m_url.m_pathAfterLastSlash = currentPosition(c);
+ }
</ins><span class="cx"> }
</span><del>- if (UNLIKELY(!isSlash)) {
- syntaxViolation(c);
- appendToASCIIBuffer('/');
- m_url.m_pathAfterLastSlash = currentPosition(c);
- }
</del><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1818,15 +1833,22 @@
</span><span class="cx"> m_url.m_userEnd = currentPosition(authorityOrHostBegin);
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userEnd;
</span><span class="cx"> if (authorityOrHostBegin.atEnd()) {
</span><del>- m_url.m_hostEnd = m_url.m_userEnd;
- m_url.m_portEnd = m_url.m_userEnd;
</del><ins>+ RELEASE_ASSERT(m_url.m_userStart >= 2);
+ ASSERT(parsedDataView(m_url.m_userStart - 2, 2) == "//");
+ m_url.m_userStart -= 2;
+ m_url.m_userEnd = m_url.m_userStart;
+ m_url.m_passwordEnd = m_url.m_userStart;
+ m_url.m_hostEnd = m_url.m_userStart;
+ m_url.m_portEnd = m_url.m_userStart;
+ m_url.m_pathEnd = m_url.m_userStart + 2;
</ins><span class="cx"> } else if (!parseHostAndPort(authorityOrHostBegin)) {
</span><span class="cx"> failure();
</span><span class="cx"> return;
</span><ins>+ } else {
+ syntaxViolation(c);
+ appendToASCIIBuffer('/');
+ m_url.m_pathEnd = m_url.m_portEnd + 1;
</ins><span class="cx"> }
</span><del>- syntaxViolation(c);
- appendToASCIIBuffer('/');
- m_url.m_pathEnd = m_url.m_portEnd + 1;
</del><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_fragmentEnd = m_url.m_pathEnd;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206782 => 206783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-04 21:13:18 UTC (rev 206782)
+++ trunk/Tools/ChangeLog 2016-10-04 21:20:54 UTC (rev 206783)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-04 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should match URL::parse and other browsers when parsing a URL containing only scheme://
+ https://bugs.webkit.org/show_bug.cgi?id=162909
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-10-04 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Introduce DOMJIT::GetterSetter to tell JIT information
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206782 => 206783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-04 21:13:18 UTC (rev 206782)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-04 21:20:54 UTC (rev 206783)
</span><span class="lines">@@ -314,6 +314,20 @@
</span><span class="cx"> checkURL("http://host:123?query", {"http", "", "", "host", 123, "/", "query", "", "http://host:123/?query"});
</span><span class="cx"> checkURL("http://host:123#", {"http", "", "", "host", 123, "/", "", "", "http://host:123/#"});
</span><span class="cx"> checkURL("http://host:123#fragment", {"http", "", "", "host", 123, "/", "", "fragment", "http://host:123/#fragment"});
</span><ins>+ checkURL("foo:////", {"foo", "", "", "", 0, "////", "", "", "foo:////"});
+ checkURL("foo:///?", {"foo", "", "", "", 0, "///", "", "", "foo:///?"});
+ checkURL("foo:///#", {"foo", "", "", "", 0, "///", "", "", "foo:///#"});
+ checkURL("foo:///", {"foo", "", "", "", 0, "///", "", "", "foo:///"});
+ checkURL("foo://?", {"foo", "", "", "", 0, "//", "", "", "foo://?"});
+ checkURL("foo://#", {"foo", "", "", "", 0, "//", "", "", "foo://#"});
+ checkURL("foo://", {"foo", "", "", "", 0, "//", "", "", "foo://"});
+ checkURL("foo:/?", {"foo", "", "", "", 0, "/", "", "", "foo:/?"});
+ checkURL("foo:/#", {"foo", "", "", "", 0, "/", "", "", "foo:/#"});
+ checkURL("foo:/", {"foo", "", "", "", 0, "/", "", "", "foo:/"});
+ checkURL("foo:?", {"foo", "", "", "", 0, "", "", "", "foo:?"});
+ checkURL("foo:#", {"foo", "", "", "", 0, "", "", "", "foo:#"});
+ checkURL("A://", {"a", "", "", "", 0, "//", "", "", "a://"});
+ checkURL("aA://", {"aa", "", "", "", 0, "//", "", "", "aa://"});
</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">@@ -433,6 +447,7 @@
</span><span class="cx"> checkRelativeURL(" ", "http://host/#fragment", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
</span><span class="cx"> checkRelativeURL(" ", "http://host/path?query#fra#gment", {"http", "", "", "host", 0, "/path", "query", "", "http://host/path?query"});
</span><span class="cx"> checkRelativeURL(" \a ", "http://host/#fragment", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
</span><ins>+ checkRelativeURL("foo://", "http://example.org/foo/bar", {"foo", "", "", "", 0, "//", "", "", "foo://"});
</ins><span class="cx">
</span><span class="cx"> // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,
</span><span class="cx"> // but it is included in the web platform tests.
</span><span class="lines">@@ -729,9 +744,6 @@
</span><span class="cx"> checkURLDifferences("notspecial://@test@test@example:800\\path@end",
</span><span class="cx"> {"notspecial", "@test@test@example", "800\\path", "end", 0, "/", "", "", "notspecial://%40test%40test%40example:800%5Cpath@end/"},
</span><span class="cx"> {"", "", "", "", 0, "", "", "", "notspecial://@test@test@example:800\\path@end"});
</span><del>- checkRelativeURLDifferences("foo://", "http://example.org/foo/bar",
- {"foo", "", "", "", 0, "/", "", "", "foo:///"},
- {"foo", "", "", "", 0, "//", "", "", "foo://"});
</del><span class="cx"> checkURLDifferences(utf16String(u"http://host?ß😍#ß😍"),
</span><span class="cx"> {"http", "", "", "host", 0, "/", "%C3%9F%F0%9F%98%8D", utf16String(u"ß😍"), utf16String(u"http://host/?%C3%9F%F0%9F%98%8D#ß😍")},
</span><span class="cx"> {"http", "", "", "host", 0, "/", "%C3%9F%F0%9F%98%8D", "%C3%9F%F0%9F%98%8D", "http://host/?%C3%9F%F0%9F%98%8D#%C3%9F%F0%9F%98%8D"}, testTabsValueForSurrogatePairs);
</span><span class="lines">@@ -753,12 +765,6 @@
</span><span class="cx"> checkURLDifferences("http://host/`",
</span><span class="cx"> {"http", "", "", "host", 0, "/%60", "", "", "http://host/%60"},
</span><span class="cx"> {"http", "", "", "host", 0, "/`", "", "", "http://host/`"});
</span><del>- checkURLDifferences("aA://",
- {"aa", "", "", "", 0, "/", "", "", "aa:///"},
- {"aa", "", "", "", 0, "//", "", "", "aa://"});
- checkURLDifferences("A://",
- {"a", "", "", "", 0, "/", "", "", "a:///"},
- {"a", "", "", "", 0, "//", "", "", "a://"});
</del><span class="cx"> checkURLDifferences("http://://",
</span><span class="cx"> {"", "", "", "", 0, "", "", "", "http://://"},
</span><span class="cx"> {"http", "", "", "", 0, "//", "", "", "http://://"});
</span></span></pre>
</div>
</div>
</body>
</html>