<!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>[174975] releases/WebKitGTK/webkit-2.6</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/174975">174975</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 09:38:35 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174712">r174712</a> - URLs that start with http:/// and https:/// lose two slashes when parsed, causing assertion failure and inconsistent behavior
https://bugs.webkit.org/show_bug.cgi?id=137718
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Added cases to fast/loader/url-parse-1.html.
* platform/URL.cpp:
(WebCore::URL::parse): In hierarchical schemes other than file:, ignore any additional
slashes after the ://, as prescribed by the authority-ignore-slashes state in the current
URL spec.
LayoutTests:
* fast/loader/url-parse-1-expected.txt: Updated results.
* fast/loader/url-parse-1.html: Added a few test cases.
* fast/url/file-http-base-expected.txt: Updated results.
* fast/url/host-expected.txt: Ditto.
* fast/url/invalid-urls-utf8-expected.txt: Ditto.
* fast/url/relative-expected.txt: Ditto.
* fast/url/standard-url-expected.txt: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastloaderurlparse1expectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastloaderurlparse1html">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfasturlfilehttpbaseexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/file-http-base-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfasturlhostexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/host-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfasturlinvalidurlsutf8expectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/invalid-urls-utf8-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfasturlrelativeexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/relative-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfasturlstandardurlexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/standard-url-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformURLcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/URL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-14 Dan Bernstein <mitz@apple.com>
+
+ URLs that start with http:/// and https:/// lose two slashes when parsed, causing assertion failure and inconsistent behavior
+ https://bugs.webkit.org/show_bug.cgi?id=137718
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/loader/url-parse-1-expected.txt: Updated results.
+ * fast/loader/url-parse-1.html: Added a few test cases.
+ * fast/url/file-http-base-expected.txt: Updated results.
+ * fast/url/host-expected.txt: Ditto.
+ * fast/url/invalid-urls-utf8-expected.txt: Ditto.
+ * fast/url/relative-expected.txt: Ditto.
+ * fast/url/standard-url-expected.txt: Ditto.
+
</ins><span class="cx"> 2014-10-14 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> [XHR] Abort method execution when m_loader->cancel() in internalAbort() caused reentry
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastloaderurlparse1expectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1-expected.txt (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1-expected.txt 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1-expected.txt 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -24,7 +24,15 @@
</span><span class="cx"> http:/ http:/ /
</span><span class="cx"> http:// http:/ /
</span><span class="cx"> http:/// http:/ /
</span><del>-http://// http:// //
</del><ins>+http://// http:/ /
+http:webkit.org http://webkit.org/ webkit.org /
+http:/webkit.org http://webkit.org/ webkit.org /
+http://webkit.org http://webkit.org/ webkit.org /
+http:///webkit.org http://webkit.org/ webkit.org /
+http:////webkit.org http://webkit.org/ webkit.org /
+http://///webkit.org http://webkit.org/ webkit.org /
+http://////webkit.org http://webkit.org/ webkit.org /
+http:////////////////webkit.org http://webkit.org/ webkit.org /
</ins><span class="cx"> http://localhost http://localhost/ localhost /
</span><span class="cx"> http://localhost/ http://localhost/ localhost /
</span><span class="cx"> http://localhost/test http://localhost/test localhost /test
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastloaderurlparse1html"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1.html (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1.html 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/loader/url-parse-1.html 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -67,6 +67,14 @@
</span><span class="cx"> "http://",
</span><span class="cx"> "http:///",
</span><span class="cx"> "http:////",
</span><ins>+ "http:webkit.org",
+ "http:/webkit.org",
+ "http://webkit.org",
+ "http:///webkit.org",
+ "http:////webkit.org",
+ "http://///webkit.org",
+ "http://////webkit.org",
+ "http:////////////////webkit.org",
</ins><span class="cx"> "http://localhost",
</span><span class="cx"> "http://localhost/",
</span><span class="cx"> "http://localhost/test",
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfasturlfilehttpbaseexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/file-http-base-expected.txt (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/file-http-base-expected.txt 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/file-http-base-expected.txt 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> FAIL canonicalize('file:c|//foo\\bar.html') should be file:///c%7C//foo/bar.html. Was file://c|//foo/bar.html.
</span><span class="cx"> FAIL canonicalize('//') should be file:///. Was http:/.
</span><span class="cx"> FAIL canonicalize('///') should be file:///. Was http:/.
</span><del>-FAIL canonicalize('///test') should be file:///test. Was http:/test.
</del><ins>+FAIL canonicalize('///test') should be file:///test. Was http://test/.
</ins><span class="cx"> PASS canonicalize('file://test') is 'file://test/'
</span><span class="cx"> FAIL canonicalize('file://localhost') should be file://localhost/. Was file:///.
</span><span class="cx"> FAIL canonicalize('file://localhost/') should be file://localhost/. Was file:///.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfasturlhostexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/host-expected.txt (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/host-expected.txt 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/host-expected.txt 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -33,16 +33,16 @@
</span><span class="cx"> FAIL canonicalize('http://www.lookout.net::==80::==443::/') should be http://www.lookout.net::%3D%3D80::%3D%3D443:/. Was http://www.lookout.net::==80::==443::/.
</span><span class="cx"> PASS canonicalize('http://www.lookout.net::80::443/') is 'http://www.lookout.net::80::443/'
</span><span class="cx"> PASS canonicalize('http://\.//') is 'http://.//'
</span><del>-FAIL canonicalize('http:////:@//') should be http:////. Was http://:@//.
</del><ins>+FAIL canonicalize('http:////:@//') should be http:////. Was http:////:@//.
</ins><span class="cx"> PASS canonicalize('http://\google.com/foo/') is 'http://google.com/foo/'
</span><del>-FAIL canonicalize('http://\\google.com/foo/') should be http://google.com/foo/. Was http:/google.com/foo/.
-PASS canonicalize('http:////asdf@//') is 'http://asdf@//'
</del><ins>+PASS canonicalize('http://\\google.com/foo/') is 'http://google.com/foo/'
+FAIL canonicalize('http:////asdf@//') should be http://asdf@//. Was http:////asdf@//.
</ins><span class="cx"> PASS canonicalize('http:////:81/') is 'http://:81/'
</span><span class="cx"> PASS canonicalize('http://:///') is 'http://:///'
</span><span class="cx"> PASS canonicalize('http://c:/') is 'http://c/'
</span><span class="cx"> PASS canonicalize('http://xxxx:/') is 'http://xxxx/'
</span><span class="cx"> PASS canonicalize('http://.:./') is 'http://.:./'
</span><del>-FAIL canonicalize('http://////@google.com//') should be http://google.com//. Was http:////@google.com//.
</del><ins>+PASS canonicalize('http://////@google.com//') is 'http://google.com//'
</ins><span class="cx"> PASS canonicalize('http://@google.com/') is 'http://google.com/'
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfasturlinvalidurlsutf8expectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/invalid-urls-utf8-expected.txt (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/invalid-urls-utf8-expected.txt 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/invalid-urls-utf8-expected.txt 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -5,6 +5,10 @@
</span><span class="cx">
</span><span class="cx"> FAIL src should be http:///. Was http:/.
</span><span class="cx"> FAIL src should be https:///. Was https:/.
</span><ins>+FAIL src should be ftp:///. Was ftp://.
+FAIL src should be gopher:///. Was gopher://.
+FAIL src should be ws:///. Was ws://.
+FAIL src should be wss:///. Was wss://.
</ins><span class="cx"> PASS src is expected
</span><span class="cx"> PASS src is expected
</span><span class="cx"> PASS src is expected
</span><span class="lines">@@ -21,10 +25,6 @@
</span><span class="cx"> PASS src is expected
</span><span class="cx"> PASS src is expected
</span><span class="cx"> PASS src is expected
</span><del>-PASS src is expected
-PASS src is expected
-PASS src is expected
-PASS src is expected
</del><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfasturlrelativeexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/relative-expected.txt (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/relative-expected.txt 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/relative-expected.txt 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> PASS canonicalize(';/../bar') is 'http://host/bar'
</span><span class="cx"> PASS canonicalize('//another') is 'http://another/'
</span><span class="cx"> PASS canonicalize('//another/path?query#ref') is 'http://another/path?query#ref'
</span><del>-FAIL canonicalize('///another/path') should be http://another/path. Was http:/another/path.
</del><ins>+PASS canonicalize('///another/path') is 'http://another/path'
</ins><span class="cx"> PASS canonicalize('//Another\\path') is 'http://another/path'
</span><span class="cx"> FAIL canonicalize('//') should be http:. Was http:/.
</span><span class="cx"> PASS canonicalize('\\/another/path') is 'http://another/path'
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfasturlstandardurlexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/standard-url-expected.txt (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/standard-url-expected.txt 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/url/standard-url-expected.txt 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> FAIL canonicalize('http://www.google.com/foo?bar=baz# »') should be http://www.google.com/foo?bar=baz# ». Was http://www.google.com/foo?bar=baz# %BB.
</span><span class="cx"> PASS canonicalize('http://[www.google.com]/') is 'http://[www.google.com]/'
</span><span class="cx"> PASS canonicalize('http://www.google.com') is 'http://www.google.com/'
</span><del>-FAIL canonicalize('http:////////user:@google.com:99?foo') should be http://user@google.com:99/?foo. Was http://////user:@google.com:99?foo.
</del><ins>+PASS canonicalize('http:////////user:@google.com:99?foo') is 'http://user@google.com:99/?foo'
</ins><span class="cx"> FAIL canonicalize('http://192.0x00A80001') should be http://192.168.0.1/. Was http://192.0x00a80001/.
</span><span class="cx"> FAIL canonicalize('http://www/foo%2Ehtml') should be http://www/foo.html. Was http://www/foo%2Ehtml.
</span><span class="cx"> PASS canonicalize('http://user:pass@/') is 'http://user:pass@/'
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-10-14 Dan Bernstein <mitz@apple.com>
+
+ URLs that start with http:/// and https:/// lose two slashes when parsed, causing assertion failure and inconsistent behavior
+ https://bugs.webkit.org/show_bug.cgi?id=137718
+
+ Reviewed by Alexey Proskuryakov.
+
+ Added cases to fast/loader/url-parse-1.html.
+
+ * platform/URL.cpp:
+ (WebCore::URL::parse): In hierarchical schemes other than file:, ignore any additional
+ slashes after the ://, as prescribed by the authority-ignore-slashes state in the current
+ URL spec.
+
</ins><span class="cx"> 2014-10-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Leverage the new RenderElement::m_isCSSAnimating flag in more places
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/URL.cpp (174974 => 174975)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/URL.cpp 2014-10-21 16:34:24 UTC (rev 174974)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/URL.cpp 2014-10-21 16:38:35 UTC (rev 174975)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> static inline bool isPathSegmentEndChar(char c) { return characterClassTable[static_cast<unsigned char>(c)] & PathSegmentEndChar; }
</span><span class="cx"> static inline bool isPathSegmentEndChar(UChar c) { return c <= 0xff && (characterClassTable[c] & PathSegmentEndChar); }
</span><span class="cx"> static inline bool isBadChar(unsigned char c) { return characterClassTable[c] & BadChar; }
</span><del>-
</del><ins>+
</ins><span class="cx"> static inline bool isSchemeCharacterMatchIgnoringCase(char character, char schemeCharacter)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isSchemeChar(character));
</span><span class="lines">@@ -1140,10 +1140,17 @@
</span><span class="cx"> // Attempt to find an authority.
</span><span class="cx"> // FIXME: Authority characters may be scanned twice, and it would be nice to be faster.
</span><span class="cx">
</span><del>- if (hierarchical)
</del><ins>+ if (hierarchical) {
</ins><span class="cx"> userStart++;
</span><del>- if (hasSecondSlash)
- userStart++;
</del><ins>+ if (hasSecondSlash) {
+ userStart++;
+ if (isNonFileHierarchicalScheme(url, schemeEnd)) {
+ while (url[userStart] == '/')
+ userStart++;
+ }
+ }
+ }
+
</ins><span class="cx"> userEnd = userStart;
</span><span class="cx">
</span><span class="cx"> int colonPos = 0;
</span></span></pre>
</div>
</div>
</body>
</html>