<!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>[213140] releases/WebKitGTK/webkit-2.16</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/213140">213140</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-28 01:42:18 -0800 (Tue, 28 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212977">r212977</a> - Non-special relative URLs should not ignore extra slashes
https://bugs.webkit.org/show_bug.cgi?id=168834
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
* web-platform-tests/url/a-element-expected.txt:
* web-platform-tests/url/a-element-xhtml-expected.txt:
* web-platform-tests/url/url-constructor-expected.txt:
Source/WebCore:
Special authority ignore slashes state should, as its name implies,
only be reached by special URLs. See https://url.spec.whatwg.org/#relative-slash-state
Covered by newly passing web platform tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementxhtmlexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlurlconstructorexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformURLParsercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog (213139 => 213140)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog 2017-02-28 09:39:54 UTC (rev 213139)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog 2017-02-28 09:42:18 UTC (rev 213140)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2017-02-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Non-special relative URLs should not ignore extra slashes
+ https://bugs.webkit.org/show_bug.cgi?id=168834
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/url/a-element-expected.txt:
+ * web-platform-tests/url/a-element-xhtml-expected.txt:
+ * web-platform-tests/url/url-constructor-expected.txt:
+
+2017-02-24 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> .. should not remove windows drive letters in paths of file URLs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168824
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt (213139 => 213140)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt 2017-02-28 09:39:54 UTC (rev 213139)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt 2017-02-28 09:42:18 UTC (rev 213140)
</span><span class="lines">@@ -403,9 +403,9 @@
</span><span class="cx"> PASS Parsing: <?x> against <sc://ñ>
</span><span class="cx"> PASS Parsing: <sc://?> against <about:blank>
</span><span class="cx"> PASS Parsing: <sc://#> against <about:blank>
</span><del>-FAIL Parsing: <///> against <sc://x/> assert_equals: href expected "sc:///" but got "///"
-FAIL Parsing: <////> against <sc://x/> assert_equals: href expected "sc:////" but got "////"
-FAIL Parsing: <////x/> against <sc://x/> assert_equals: href expected "sc:////x/" but got "sc://x/"
</del><ins>+PASS Parsing: <///> against <sc://x/>
+PASS Parsing: <////> against <sc://x/>
+PASS Parsing: <////x/> against <sc://x/>
</ins><span class="cx"> PASS Parsing: <tftp://foobar.com/someconfig;mode=netascii> against <about:blank>
</span><span class="cx"> PASS Parsing: <telnet://user:pass@foobar.com:23/> against <about:blank>
</span><span class="cx"> PASS Parsing: <ut2004://10.10.10.10:7777/Index.ut2> against <about:blank>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementxhtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt (213139 => 213140)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt 2017-02-28 09:39:54 UTC (rev 213139)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt 2017-02-28 09:42:18 UTC (rev 213140)
</span><span class="lines">@@ -403,9 +403,9 @@
</span><span class="cx"> PASS Parsing: <?x> against <sc://ñ>
</span><span class="cx"> PASS Parsing: <sc://?> against <about:blank>
</span><span class="cx"> PASS Parsing: <sc://#> against <about:blank>
</span><del>-FAIL Parsing: <///> against <sc://x/> assert_equals: href expected "sc:///" but got "///"
-FAIL Parsing: <////> against <sc://x/> assert_equals: href expected "sc:////" but got "////"
-FAIL Parsing: <////x/> against <sc://x/> assert_equals: href expected "sc:////x/" but got "sc://x/"
</del><ins>+PASS Parsing: <///> against <sc://x/>
+PASS Parsing: <////> against <sc://x/>
+PASS Parsing: <////x/> against <sc://x/>
</ins><span class="cx"> PASS Parsing: <tftp://foobar.com/someconfig;mode=netascii> against <about:blank>
</span><span class="cx"> PASS Parsing: <telnet://user:pass@foobar.com:23/> against <about:blank>
</span><span class="cx"> PASS Parsing: <ut2004://10.10.10.10:7777/Index.ut2> against <about:blank>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlurlconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt (213139 => 213140)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt 2017-02-28 09:39:54 UTC (rev 213139)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt 2017-02-28 09:42:18 UTC (rev 213140)
</span><span class="lines">@@ -411,9 +411,9 @@
</span><span class="cx"> PASS Parsing: <?x> against <sc://ñ>
</span><span class="cx"> PASS Parsing: <sc://?> against <about:blank>
</span><span class="cx"> PASS Parsing: <sc://#> against <about:blank>
</span><del>-FAIL Parsing: <///> against <sc://x/> Type error
-FAIL Parsing: <////> against <sc://x/> Type error
-FAIL Parsing: <////x/> against <sc://x/> assert_equals: href expected "sc:////x/" but got "sc://x/"
</del><ins>+PASS Parsing: <///> against <sc://x/>
+PASS Parsing: <////> against <sc://x/>
+PASS Parsing: <////x/> against <sc://x/>
</ins><span class="cx"> PASS Parsing: <tftp://foobar.com/someconfig;mode=netascii> against <about:blank>
</span><span class="cx"> PASS Parsing: <telnet://user:pass@foobar.com:23/> against <about:blank>
</span><span class="cx"> PASS Parsing: <ut2004://10.10.10.10:7777/Index.ut2> against <about:blank>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213139 => 213140)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:39:54 UTC (rev 213139)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:42:18 UTC (rev 213140)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-24 Alex Christensen <achristensen@webkit.org>
+
+ Non-special relative URLs should not ignore extra slashes
+ https://bugs.webkit.org/show_bug.cgi?id=168834
+
+ Reviewed by Sam Weinig.
+
+ Special authority ignore slashes state should, as its name implies,
+ only be reached by special URLs. See https://url.spec.whatwg.org/#relative-slash-state
+
+ Covered by newly passing web platform tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+
</ins><span class="cx"> 2017-02-24 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix for newer clang
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp (213139 => 213140)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp 2017-02-28 09:39:54 UTC (rev 213139)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp 2017-02-28 09:42:18 UTC (rev 213140)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #define URL_PARSER_DEBUGGING 0
</span><del>-#define COMPARE_URLPARSERS 0
</del><span class="cx">
</span><span class="cx"> #if URL_PARSER_DEBUGGING
</span><span class="cx"> #define URL_PARSER_LOG(...) LOG(URLParser, __VA_ARGS__)
</span><span class="lines">@@ -1389,7 +1388,13 @@
</span><span class="cx"> ++c;
</span><span class="cx"> copyURLPartsUntil(base, URLPart::SchemeEnd, c, isUTF8Encoding);
</span><span class="cx"> appendToASCIIBuffer("://", 3);
</span><del>- state = State::SpecialAuthorityIgnoreSlashes;
</del><ins>+ if (m_urlIsSpecial)
+ state = State::SpecialAuthorityIgnoreSlashes;
+ else {
+ m_url.m_userStart = currentPosition(c);
+ state = State::AuthorityOrHost;
+ authorityOrHostBegin = c;
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PortEnd, c, isUTF8Encoding);
</span><span class="cx"> appendToASCIIBuffer('/');
</span></span></pre>
</div>
</div>
</body>
</html>