<!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>[205749] 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/205749">205749</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-09 10:06:24 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should parse URLs with non-special schemes
https://bugs.webkit.org/show_bug.cgi?id=161786
Reviewed by Andy Estes.
Source/WebCore:
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
There's no reason for a SchemeEndCheckForSlashes state now that we can copy iterators.
It's not in the spec and not needed.
Also, move things around a little so parsing special or non-special schemes
followed by one or two slashes works correctly.
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 (205748 => 205749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-09-09 16:57:50 UTC (rev 205748)
+++ trunk/Source/WebCore/ChangeLog        2016-09-09 17:06:24 UTC (rev 205749)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-09 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse URLs with non-special schemes
+ https://bugs.webkit.org/show_bug.cgi?id=161786
+
+ Reviewed by Andy Estes.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+ There's no reason for a SchemeEndCheckForSlashes state now that we can copy iterators.
+ It's not in the spec and not needed.
+ Also, move things around a little so parsing special or non-special schemes
+ followed by one or two slashes works correctly.
+
</ins><span class="cx"> 2016-09-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r186020): Null dereference in getStartDate()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205748 => 205749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp        2016-09-09 16:57:50 UTC (rev 205748)
+++ trunk/Source/WebCore/platform/URLParser.cpp        2016-09-09 17:06:24 UTC (rev 205749)
</span><span class="lines">@@ -399,7 +399,6 @@
</span><span class="cx"> enum class State : uint8_t {
</span><span class="cx"> SchemeStart,
</span><span class="cx"> Scheme,
</span><del>- SchemeEndCheckForSlashes,
</del><span class="cx"> NoScheme,
</span><span class="cx"> SpecialRelativeOrAuthority,
</span><span class="cx"> PathOrAuthority,
</span><span class="lines">@@ -454,6 +453,7 @@
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ m_buffer.append(':');
</ins><span class="cx"> if (isSpecialScheme(urlScheme)) {
</span><span class="cx"> m_urlIsSpecial = true;
</span><span class="cx"> if (base.protocol() == urlScheme)
</span><span class="lines">@@ -460,9 +460,27 @@
</span><span class="cx"> state = State::SpecialRelativeOrAuthority;
</span><span class="cx"> else
</span><span class="cx"> state = State::SpecialAuthoritySlashes;
</span><del>- } else
- state = State::SchemeEndCheckForSlashes;
- m_buffer.append(':');
</del><ins>+ } else {
+ m_url.m_userStart = m_buffer.length();
+ 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;
+ auto maybeSlash = c;
+ ++maybeSlash;
+ if (maybeSlash != end && *maybeSlash == '/') {
+ m_buffer.append('/');
+ m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
+ state = State::PathOrAuthority;
+ ++c;
+ ASSERT(*c == '/');
+ } else {
+ m_url.m_pathAfterLastSlash = m_url.m_userStart;
+ state = State::CannotBeABaseURLPath;
+ }
+ ++c;
+ break;
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> m_buffer.clear();
</span><span class="cx"> state = State::NoScheme;
</span><span class="lines">@@ -478,23 +496,6 @@
</span><span class="cx"> c = codePoints.begin();
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case State::SchemeEndCheckForSlashes:
- LOG_STATE("SchemeEndCheckForSlashes");
- if (*c == '/') {
- m_buffer.append("//");
- m_url.m_userStart = m_buffer.length();
- state = State::PathOrAuthority;
- ++c;
- } else {
- m_url.m_userStart = m_buffer.length();
- 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_pathAfterLastSlash = m_url.m_userStart,
- state = State::CannotBeABaseURLPath;
- }
- break;
</del><span class="cx"> case State::NoScheme:
</span><span class="cx"> LOG_STATE("NoScheme");
</span><span class="cx"> if (base.isNull()) {
</span><span class="lines">@@ -531,6 +532,8 @@
</span><span class="cx"> case State::PathOrAuthority:
</span><span class="cx"> LOG_STATE("PathOrAuthority");
</span><span class="cx"> if (*c == '/') {
</span><ins>+ m_buffer.append('/');
+ m_url.m_userStart = m_buffer.length();
</ins><span class="cx"> state = State::AuthorityOrHost;
</span><span class="cx"> ++c;
</span><span class="cx"> authorityOrHostBegin = c;
</span><span class="lines">@@ -579,6 +582,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::SpecialAuthoritySlashes:
</span><span class="cx"> LOG_STATE("SpecialAuthoritySlashes");
</span><ins>+ m_buffer.append("//");
</ins><span class="cx"> if (*c == '/') {
</span><span class="cx"> ++c;
</span><span class="cx"> while (c != end && isTabOrNewline(*c))
</span><span class="lines">@@ -585,11 +589,8 @@
</span><span class="cx"> ++c;
</span><span class="cx"> if (c == end)
</span><span class="cx"> return failure(input);
</span><del>- m_buffer.append('/');
- if (*c == '/') {
- m_buffer.append('/');
</del><ins>+ if (*c == '/')
</ins><span class="cx"> ++c;
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> state = State::SpecialAuthorityIgnoreSlashes;
</span><span class="cx"> break;
</span><span class="lines">@@ -859,9 +860,6 @@
</span><span class="cx"> case State::Scheme:
</span><span class="cx"> LOG_FINAL_STATE("Scheme");
</span><span class="cx"> break;
</span><del>- case State::SchemeEndCheckForSlashes:
- LOG_FINAL_STATE("SchemeEndCheckForSlashes");
- break;
</del><span class="cx"> case State::NoScheme:
</span><span class="cx"> LOG_FINAL_STATE("NoScheme");
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205748 => 205749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-09-09 16:57:50 UTC (rev 205748)
+++ trunk/Tools/ChangeLog        2016-09-09 17:06:24 UTC (rev 205749)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-09 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse URLs with non-special schemes
+ https://bugs.webkit.org/show_bug.cgi?id=161786
+
+ Reviewed by Andy Estes.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-09-08 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205748 => 205749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-09-09 16:57:50 UTC (rev 205748)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-09-09 17:06:24 UTC (rev 205749)
</span><span class="lines">@@ -193,6 +193,10 @@
</span><span class="cx"> checkURL("http://host:", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
</span><span class="cx"> checkURL("http://hos\tt\n:\t1\n2\t3\t/\npath", {"http", "", "", "host", 123, "/path", "", "", "http://host:123/path"});
</span><span class="cx"> checkURL("http://user@example.org/path3", {"http", "user", "", "example.org", 0, "/path3", "", "", "http://user@example.org/path3"});
</span><ins>+ checkURL("sc:/pa/pa", {"sc", "", "", "", 0, "/pa/pa", "", "", "sc:/pa/pa"});
+ checkURL("sc:/pa", {"sc", "", "", "", 0, "/pa", "", "", "sc:/pa"});
+ checkURL("sc:/pa/", {"sc", "", "", "", 0, "/pa/", "", "", "sc:/pa/"});
+ checkURL("sc://pa/", {"sc", "", "", "pa", 0, "/", "", "", "sc://pa/"});
</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">@@ -257,6 +261,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(" \a \t\n", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/foo/bar", "", "", "http://example.org/foo/bar"});
</span><span class="cx"> checkRelativeURL(":foo.com\\", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/foo/:foo.com/", "", "", "http://example.org/foo/:foo.com/"});
</span><ins>+ checkRelativeURL("http:/example.com/", "about:blank", {"http", "", "", "example.com", 0, "/", "", "", "http://example.com/"});
+ checkRelativeURL("http:example.com/", "about:blank", {"http", "", "", "example.com", 0, "/", "", "", "http://example.com/"});
</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">@@ -402,6 +408,10 @@
</span><span class="cx"> checkRelativeURLDifferences(":foo.com\\", "notspecial://example.org/foo/bar",
</span><span class="cx"> {"notspecial", "", "", "example.org", 0, "/foo/:foo.com\\", "", "", "notspecial://example.org/foo/:foo.com\\"},
</span><span class="cx"> {"notspecial", "", "", "example.org", 0, "/foo/:foo.com/", "", "", "notspecial://example.org/foo/:foo.com/"});
</span><ins>+ checkURLDifferences("sc://pa",
+ {"sc", "", "", "pa", 0, "/", "", "", "sc://pa/"},
+ {"sc", "", "", "pa", 0, "", "", "", "sc://pa"});
+
</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 class="lines">@@ -476,8 +486,25 @@
</span><span class="cx"> checkURLDifferences("wss://host:444",
</span><span class="cx"> {"wss", "", "", "host", 444, "/", "", "", "wss://host:444/"},
</span><span class="cx"> {"wss", "", "", "host", 444, "", "", "", "wss://host:444"});
</span><del>-
- // FIXME: Fix and check unknown schemes with ports, as well as ftps.
</del><ins>+
+ // 990 is the default ftps port in URL::parse, but it's not in the URL spec. Maybe it should be.
+ checkURL("ftps://host:990/", {"ftps", "", "", "host", 990, "/", "", "", "ftps://host:990/"});
+ checkURL("ftps://host:991/", {"ftps", "", "", "host", 991, "/", "", "", "ftps://host:991/"});
+ checkURLDifferences("ftps://host:990",
+ {"ftps", "", "", "host", 990, "/", "", "", "ftps://host:990/"},
+ {"ftps", "", "", "host", 990, "", "", "", "ftps://host:990"});
+ checkURLDifferences("ftps://host:991",
+ {"ftps", "", "", "host", 991, "/", "", "", "ftps://host:991/"},
+ {"ftps", "", "", "host", 991, "", "", "", "ftps://host:991"});
+
+ checkURL("unknown://host:80/", {"unknown", "", "", "host", 80, "/", "", "", "unknown://host:80/"});
+ checkURL("unknown://host:81/", {"unknown", "", "", "host", 81, "/", "", "", "unknown://host:81/"});
+ checkURLDifferences("unknown://host:80",
+ {"unknown", "", "", "host", 80, "/", "", "", "unknown://host:80/"},
+ {"unknown", "", "", "host", 80, "", "", "", "unknown://host:80"});
+ checkURLDifferences("unknown://host:81",
+ {"unknown", "", "", "host", 81, "/", "", "", "unknown://host:81/"},
+ {"unknown", "", "", "host", 81, "", "", "", "unknown://host:81"});
</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>