<!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>[206819] 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/206819">206819</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-05 11:27:53 -0700 (Wed, 05 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should correctly strip unnecessary 0's in IPv6 addresses
https://bugs.webkit.org/show_bug.cgi?id=162979
Reviewed by Brady Eidson.
Source/WebCore:
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parseIPv6Host):
Strip leading 0's and any 0's before the last 0 if the value is 0.
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 (206818 => 206819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-05 18:25:02 UTC (rev 206818)
+++ trunk/Source/WebCore/ChangeLog 2016-10-05 18:27:53 UTC (rev 206819)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-10-05 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser should correctly strip unnecessary 0's in IPv6 addresses
+ https://bugs.webkit.org/show_bug.cgi?id=162979
+
+ Reviewed by Brady Eidson.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parseIPv6Host):
+ Strip leading 0's and any 0's before the last 0 if the value is 0.
+
+2016-10-05 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> UTF-8 encode queries of nonspecial and websocket schemes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162956
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206818 => 206819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-05 18:25:02 UTC (rev 206818)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-05 18:27:53 UTC (rev 206819)
</span><span class="lines">@@ -2361,6 +2361,7 @@
</span><span class="cx"> }
</span><span class="cx"> uint16_t value = 0;
</span><span class="cx"> size_t length = 0;
</span><ins>+ bool leadingZeros = false;
</ins><span class="cx"> for (; length < 4; length++) {
</span><span class="cx"> if (c.atEnd())
</span><span class="cx"> break;
</span><span class="lines">@@ -2368,10 +2369,13 @@
</span><span class="cx"> break;
</span><span class="cx"> if (isASCIIUpper(*c))
</span><span class="cx"> syntaxViolation(hostBegin);
</span><ins>+ if (*c == '0' && !length)
+ leadingZeros = true;
</ins><span class="cx"> value = value * 0x10 + toASCIIHexValue(*c);
</span><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> }
</span><del>- if (UNLIKELY(length > 1 && !value))
</del><ins>+
+ if (UNLIKELY((value && leadingZeros) || (!value && length > 1)))
</ins><span class="cx"> syntaxViolation(hostBegin);
</span><span class="cx">
</span><span class="cx"> address[piecePointer++] = value;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206818 => 206819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-05 18:25:02 UTC (rev 206818)
+++ trunk/Tools/ChangeLog 2016-10-05 18:27:53 UTC (rev 206819)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-10-05 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser should correctly strip unnecessary 0's in IPv6 addresses
+ https://bugs.webkit.org/show_bug.cgi?id=162979
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2016-10-05 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> UTF-8 encode queries of nonspecial and websocket schemes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162956
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206818 => 206819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-05 18:25:02 UTC (rev 206818)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-05 18:27:53 UTC (rev 206819)
</span><span class="lines">@@ -570,6 +570,21 @@
</span><span class="cx"> checkURLDifferences("http://[a:0:0:0:b:c::d]",
</span><span class="cx"> {"http", "", "", "[a::b:c:0:d]", 0, "/", "", "", "http://[a::b:c:0:d]/"},
</span><span class="cx"> {"http", "", "", "[a:0:0:0:b:c::d]", 0, "/", "", "", "http://[a:0:0:0:b:c::d]/"});
</span><ins>+ checkURLDifferences("http://[::7f00:0001]/",
+ {"http", "", "", "[::7f00:1]", 0, "/", "", "", "http://[::7f00:1]/"},
+ {"http", "", "", "[::7f00:0001]", 0, "/", "", "", "http://[::7f00:0001]/"});
+ checkURLDifferences("http://[::7f00:00]/",
+ {"http", "", "", "[::7f00:0]", 0, "/", "", "", "http://[::7f00:0]/"},
+ {"http", "", "", "[::7f00:00]", 0, "/", "", "", "http://[::7f00:00]/"});
+ checkURLDifferences("http://[::0:7f00:0001]/",
+ {"http", "", "", "[::7f00:1]", 0, "/", "", "", "http://[::7f00:1]/"},
+ {"http", "", "", "[::0:7f00:0001]", 0, "/", "", "", "http://[::0:7f00:0001]/"});
+ checkURLDifferences("http://127.00.0.1/",
+ {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"},
+ {"http", "", "", "127.00.0.1", 0, "/", "", "", "http://127.00.0.1/"});
+ checkURLDifferences("http://127.0.0.01/",
+ {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"},
+ {"http", "", "", "127.0.0.01", 0, "/", "", "", "http://127.0.0.01/"});
</ins><span class="cx"> checkURLDifferences("http://example.com/path1/.%2e",
</span><span class="cx"> {"http", "", "", "example.com", 0, "/", "", "", "http://example.com/"},
</span><span class="cx"> {"http", "", "", "example.com", 0, "/path1/.%2e", "", "", "http://example.com/path1/.%2e"});
</span></span></pre>
</div>
</div>
</body>
</html>