<!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>[206477] 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/206477">206477</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-27 17:31:44 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser: Handle windows drive letters after two slashes in relative URLs according to spec
https://bugs.webkit.org/show_bug.cgi?id=162646
Reviewed by Saam Barati.
Source/WebCore:
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::CodePointIterator::codeUnitsSince):
(WebCore::URLParser::appendWindowsDriveLetter):
(WebCore::URLParser::parse):
(WebCore::isWindowsDriveLetter): Deleted.
(WebCore::URLParser::checkWindowsDriveLetter): Deleted.
* platform/URLParser.h:
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="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</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 (206476 => 206477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-28 00:26:15 UTC (rev 206476)
+++ trunk/Source/WebCore/ChangeLog 2016-09-28 00:31:44 UTC (rev 206477)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-09-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser: Handle windows drive letters after two slashes in relative URLs according to spec
+ https://bugs.webkit.org/show_bug.cgi?id=162646
+
+ Reviewed by Saam Barati.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::CodePointIterator::codeUnitsSince):
+ (WebCore::URLParser::appendWindowsDriveLetter):
+ (WebCore::URLParser::parse):
+ (WebCore::isWindowsDriveLetter): Deleted.
+ (WebCore::URLParser::checkWindowsDriveLetter): Deleted.
+ * platform/URLParser.h:
+
+2016-09-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> URLs with @ in the user should only search for the last @ until the end of the authority and host
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162635
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206476 => 206477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-28 00:26:15 UTC (rev 206476)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-28 00:31:44 UTC (rev 206477)
</span><span class="lines">@@ -77,6 +77,11 @@
</span><span class="cx"> ASSERT(m_begin >= reference);
</span><span class="cx"> return m_begin - reference;
</span><span class="cx"> }
</span><ins>+
+ size_t codeUnitsSince(const CodePointIterator& other) const
+ {
+ return codeUnitsSince(other.m_begin);
+ }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const CharacterType* m_begin { nullptr };
</span><span class="lines">@@ -436,13 +441,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static bool isWindowsDriveLetter(const Vector<LChar>& buffer, size_t index)
-{
- if (buffer.size() < index + 2)
- return false;
- return isASCIIAlpha(buffer[index]) && (buffer[index + 1] == ':' || buffer[index + 1] == '|');
-}
-
</del><span class="cx"> void URLParser::appendToASCIIBuffer(UChar32 codePoint)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_unicodeFragmentBuffer.isEmpty());
</span><span class="lines">@@ -459,16 +457,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-void URLParser::checkWindowsDriveLetter(CodePointIterator<CharacterType>& iterator)
</del><ins>+void URLParser::appendWindowsDriveLetter(CodePointIterator<CharacterType>& iterator)
</ins><span class="cx"> {
</span><del>- if (isWindowsDriveLetter(iterator)) {
- appendToASCIIBuffer(*iterator);
- advance(iterator);
- ASSERT(!iterator.atEnd());
- ASSERT(*iterator == ':' || *iterator == '|');
- appendToASCIIBuffer(':');
- advance(iterator);
- }
</del><ins>+ ASSERT(isWindowsDriveLetter(iterator));
+ appendToASCIIBuffer(*iterator);
+ advance(iterator);
+ ASSERT(!iterator.atEnd());
+ ASSERT(*iterator == ':' || *iterator == '|');
+ appendToASCIIBuffer(':');
+ advance(iterator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><span class="lines">@@ -1409,7 +1406,8 @@
</span><span class="cx"> m_url.m_hostEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_portEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</span><del>- checkWindowsDriveLetter(c);
</del><ins>+ if (isWindowsDriveLetter(c))
+ appendWindowsDriveLetter(c);
</ins><span class="cx"> }
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="lines">@@ -1452,18 +1450,21 @@
</span><span class="cx"> m_url.m_hostEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_portEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</span><del>- checkWindowsDriveLetter(c);
</del><ins>+ if (isWindowsDriveLetter(c))
+ appendWindowsDriveLetter(c);
</ins><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> case State::FileHost:
</span><span class="cx"> LOG_STATE("FileHost");
</span><span class="cx"> if (isSlashQuestionOrHash(*c)) {
</span><del>- if (WebCore::isWindowsDriveLetter(m_asciiBuffer, m_url.m_portEnd + 1)) {
- state = State::Path;
- break;
</del><ins>+ bool windowsQuirk = c.codeUnitsSince(authorityOrHostBegin) == 2 && isWindowsDriveLetter(authorityOrHostBegin);
+ if (windowsQuirk) {
+ syntaxViolation(authorityOrHostBegin);
+ appendToASCIIBuffer('/');
+ appendWindowsDriveLetter(authorityOrHostBegin);
</ins><span class="cx"> }
</span><del>- if (authorityOrHostBegin == c) {
- ASSERT(parsedDataView(currentPosition(c) - 1, 1) == "/");
</del><ins>+ if (windowsQuirk || authorityOrHostBegin == c) {
+ ASSERT(windowsQuirk || parsedDataView(currentPosition(c) - 1, 1) == "/");
</ins><span class="cx"> if (UNLIKELY(*c == '?')) {
</span><span class="cx"> syntaxViolation(c);
</span><span class="cx"> appendToASCIIBuffer("/?", 2);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (206476 => 206477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-09-28 00:26:15 UTC (rev 206476)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-09-28 00:31:44 UTC (rev 206477)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> template<typename CharacterType> void fragmentSyntaxViolation(const CodePointIterator<CharacterType>&);
</span><span class="cx"> template<typename CharacterType> bool isWindowsDriveLetter(CodePointIterator<CharacterType>);
</span><span class="cx"> template<typename CharacterType> bool shouldCopyFileURL(CodePointIterator<CharacterType>);
</span><del>- template<typename CharacterType> void checkWindowsDriveLetter(CodePointIterator<CharacterType>&);
</del><ins>+ template<typename CharacterType> void appendWindowsDriveLetter(CodePointIterator<CharacterType>&);
</ins><span class="cx"> template<typename CharacterType> size_t currentPosition(const CodePointIterator<CharacterType>&);
</span><span class="cx"> template<typename UnsignedIntegerType> void appendNumberToASCIIBuffer(UnsignedIntegerType);
</span><span class="cx"> template<bool(*isInCodeSet)(UChar32), typename CharacterType> void utf8PercentEncode(const CodePointIterator<CharacterType>&);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206476 => 206477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-28 00:26:15 UTC (rev 206476)
+++ trunk/Tools/ChangeLog 2016-09-28 00:31:44 UTC (rev 206477)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-09-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser: Handle windows drive letters after two slashes in relative URLs according to spec
+ https://bugs.webkit.org/show_bug.cgi?id=162646
+
+ Reviewed by Saam Barati.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2016-09-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> URLs with @ in the user should only search for the last @ until the end of the authority and host
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162635
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206476 => 206477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-28 00:26:15 UTC (rev 206476)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-28 00:31:44 UTC (rev 206477)
</span><span class="lines">@@ -651,6 +651,18 @@
</span><span class="cx"> checkURLDifferences("A://",
</span><span class="cx"> {"a", "", "", "", 0, "/", "", "", "a:///"},
</span><span class="cx"> {"a", "", "", "", 0, "//", "", "", "a://"});
</span><ins>+ checkRelativeURLDifferences("//C|/foo/bar", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/C:/foo/bar", "", "", "file:///C:/foo/bar"},
+ {"", "", "", "", 0, "", "", "", "//C|/foo/bar"});
+ checkRelativeURLDifferences("//C:/foo/bar", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/C:/foo/bar", "", "", "file:///C:/foo/bar"},
+ {"file", "", "", "c", 0, "/foo/bar", "", "", "file://c/foo/bar"});
+ checkRelativeURLDifferences("//C|?foo/bar", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/C:/", "foo/bar", "", "file:///C:/?foo/bar"},
+ {"", "", "", "", 0, "", "", "", "//C|?foo/bar"});
+ checkRelativeURLDifferences("//C|#foo/bar", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/C:/", "", "foo/bar", "file:///C:/#foo/bar"},
+ {"", "", "", "", 0, "", "", "", "//C|#foo/bar"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span><span class="lines">@@ -790,6 +802,7 @@
</span><span class="cx"> shouldFail("://:0/", "");
</span><span class="cx"> shouldFail("://:0/", "about:blank");
</span><span class="cx"> shouldFail("about~");
</span><ins>+ shouldFail("//C:asdf/foo/bar", "file:///tmp/mock/path");
</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>