<!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>[205667] 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/205667">205667</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-08 15:15:07 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should handle URLs with empty authority
https://bugs.webkit.org/show_bug.cgi?id=161711
Reviewed by Brady Eidson.
Source/WebCore:
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
(WebCore::URLParser::parseAuthority):
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 (205666 => 205667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-08 22:12:05 UTC (rev 205666)
+++ trunk/Source/WebCore/ChangeLog 2016-09-08 22:15:07 UTC (rev 205667)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-08 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should handle URLs with empty authority
+ https://bugs.webkit.org/show_bug.cgi?id=161711
+
+ Reviewed by Brady Eidson.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+ (WebCore::URLParser::parseAuthority):
+
</ins><span class="cx"> 2016-09-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLImageElement.hspace / vspace attributes should be unsigned
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205666 => 205667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-08 22:12:05 UTC (rev 205666)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-08 22:15:07 UTC (rev 205667)
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::SpecialAuthorityIgnoreSlashes:
</span><span class="cx"> LOG_FINAL_STATE("SpecialAuthorityIgnoreSlashes");
</span><del>- break;
</del><ins>+ return { };
</ins><span class="cx"> case State::AuthorityOrHost:
</span><span class="cx"> LOG_FINAL_STATE("AuthorityOrHost");
</span><span class="cx"> m_url.m_userEnd = m_buffer.length();
</span><span class="lines">@@ -974,13 +974,25 @@
</span><span class="cx">
</span><span class="cx"> void URLParser::parseAuthority(StringView::CodePoints::Iterator& iterator, const StringView::CodePoints::Iterator& end)
</span><span class="cx"> {
</span><ins>+ if (iterator == end) {
+ m_url.m_userEnd = m_buffer.length();
+ m_url.m_passwordEnd = m_url.m_userEnd;
+ return;
+ }
</ins><span class="cx"> for (; iterator != end; ++iterator) {
</span><del>- m_buffer.append(*iterator);
</del><span class="cx"> if (*iterator == ':') {
</span><span class="cx"> ++iterator;
</span><del>- m_url.m_userEnd = m_buffer.length() - 1;
</del><ins>+ m_url.m_userEnd = m_buffer.length();
+ if (iterator == end) {
+ m_url.m_passwordEnd = m_url.m_userEnd;
+ if (m_url.m_userEnd > m_url.m_userStart)
+ m_buffer.append('@');
+ return;
+ }
+ m_buffer.append(':');
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ m_buffer.append(*iterator);
</ins><span class="cx"> }
</span><span class="cx"> for (; iterator != end; ++iterator)
</span><span class="cx"> m_buffer.append(*iterator);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205666 => 205667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-08 22:12:05 UTC (rev 205666)
+++ trunk/Tools/ChangeLog 2016-09-08 22:15:07 UTC (rev 205667)
</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 handle URLs with empty authority
+ https://bugs.webkit.org/show_bug.cgi?id=161711
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2016-09-08 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Re-land r205580 after r205649 fixed the test failures
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161668
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205666 => 205667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-08 22:12:05 UTC (rev 205666)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-08 22:15:07 UTC (rev 205667)
</span><span class="lines">@@ -178,6 +178,11 @@
</span><span class="cx"> checkURL("http://host/A b", {"http", "", "", "host", 0, "/A%20b", "", "", "http://host/A%20b"});
</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><ins>+ checkURL("http://user:@host", {"http", "user", "", "host", 0, "/", "", "", "http://user@host/"});
+
+ // This disagrees with the web platform test for http://:@www.example.com but agrees with Chrome and URL::parse,
+ // and Firefox fails the web platform test differently. Maybe the web platform test ought to be changed.
+ checkURL("http://:@host", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void checkRelativeURL(const String& urlString, const String& baseURLString, const ExpectedParts& parts)
</span><span class="lines">@@ -230,6 +235,8 @@
</span><span class="cx"> checkRelativeURL("?#", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/foo/bar", "", "", "http://example.org/foo/bar?#"});
</span><span class="cx"> checkRelativeURL("#?", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/foo/bar", "", "?", "http://example.org/foo/bar#?"});
</span><span class="cx"> checkRelativeURL("/", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/", "", "", "http://example.org/"});
</span><ins>+ checkRelativeURL("http://@host", "about:blank", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
+ checkRelativeURL("http://:@host", "about:blank", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
</span><span class="lines">@@ -354,11 +361,14 @@
</span><span class="cx"> checkRelativeURLDifferences(wideString(L"#β"), "http://example.org/foo/bar",
</span><span class="cx"> {"http", "", "", "example.org", 0, "/foo/bar", "", wideString(L"β"), wideString(L"http://example.org/foo/bar#β")},
</span><span class="cx"> {"http", "", "", "example.org", 0, "/foo/bar", "", "%CE%B2", "http://example.org/foo/bar#%CE%B2"});
</span><del>-
- // FIXME: This behavior ought to be specified in the standard.
- // With the existing URL::parse, WebKit returns "https:/", Firefox returns "https:///", and Chrome throws an error.
</del><ins>+ checkURLDifferences("http://@",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://@"});
+ checkURLDifferences("http://",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"http", "", "", "", 0, "/", "", "", "http:/"});
</ins><span class="cx"> checkRelativeURLDifferences("//", "https://www.webkit.org/path",
</span><del>- {"https", "", "", "", 0, "", "", "", "https://"},
</del><ins>+ {"", "", "", "", 0, "", "", "", ""},
</ins><span class="cx"> {"https", "", "", "", 0, "/", "", "", "https:/"});
</span><span class="cx">
</span><span class="cx"> // This behavior matches Chrome and Firefox, but not WebKit using URL::parse.
</span><span class="lines">@@ -436,6 +446,24 @@
</span><span class="cx"> {"wss", "", "", "host", 444, "", "", "", "wss://host:444"});
</span><span class="cx">
</span><span class="cx"> // FIXME: Fix and check unknown schemes with ports, as well as ftps.
</span><ins>+
+ // Firefox returns http://a:@/ Chrome fails, URL::parse fails
+ checkRelativeURLDifferences("http://a:@", "about:blank",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://a:@"});
+
+ checkRelativeURLDifferences("http://:@", "about:blank",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://:@"});
+ checkRelativeURLDifferences("http://:b@", "about:blank",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://:b@"});
+ checkURLDifferences("http://a:@",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://a:@"});
+ checkURLDifferences("http://:b@",
+ {"", "", "", "", 0, "", "", "", ""},
+ {"", "", "", "", 0, "", "", "", "http://:b@"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void shouldFail(const String& urlString)
</span></span></pre>
</div>
</div>
</body>
</html>