<!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>[206842] 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/206842">206842</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-05 19:35:12 -0700 (Wed, 05 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should parse IPv4 addresses as the last two pieces of an IPv6 address
https://bugs.webkit.org/show_bug.cgi?id=162991
Reviewed by Saam Barati.
Source/WebCore:
The last 32 bits of an IPv6 address can be written in the form of an IPv4 address,
but the syntax is stricter than if it were just an IPv4 address. There must be 4 pieces,
and each piece must be decimal (no octal or hex allowed). These should serialize to
regular hex IPv6 addresses.
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parseIPv4Piece):
(WebCore::URLParser::parseIPv4Host):
(WebCore::URLParser::parseIPv4PieceInsideIPv6):
(WebCore::URLParser::parseIPv4AddressInsideIPv6):
(WebCore::URLParser::parseIPv6Host):
(WebCore::URLParser::parseIPv4Number): 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 (206841 => 206842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-06 00:50:59 UTC (rev 206841)
+++ trunk/Source/WebCore/ChangeLog 2016-10-06 02:35:12 UTC (rev 206842)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-10-05 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse IPv4 addresses as the last two pieces of an IPv6 address
+ https://bugs.webkit.org/show_bug.cgi?id=162991
+
+ Reviewed by Saam Barati.
+
+ The last 32 bits of an IPv6 address can be written in the form of an IPv4 address,
+ but the syntax is stricter than if it were just an IPv4 address. There must be 4 pieces,
+ and each piece must be decimal (no octal or hex allowed). These should serialize to
+ regular hex IPv6 addresses.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parseIPv4Piece):
+ (WebCore::URLParser::parseIPv4Host):
+ (WebCore::URLParser::parseIPv4PieceInsideIPv6):
+ (WebCore::URLParser::parseIPv4AddressInsideIPv6):
+ (WebCore::URLParser::parseIPv6Host):
+ (WebCore::URLParser::parseIPv4Number): Deleted.
+ * platform/URLParser.h:
+
</ins><span class="cx"> 2016-10-05 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Put variation fonts work behind a compile-time flag
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206841 => 206842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-06 00:50:59 UTC (rev 206841)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-06 02:35:12 UTC (rev 206842)
</span><span class="lines">@@ -2185,7 +2185,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<uint32_t> URLParser::parseIPv4Number(CodePointIterator<CharacterType>& iterator, bool& didSeeSyntaxViolation)
</del><ins>+Optional<uint32_t> URLParser::parseIPv4Piece(CodePointIterator<CharacterType>& iterator, bool& didSeeSyntaxViolation)
</ins><span class="cx"> {
</span><span class="cx"> enum class State : uint8_t {
</span><span class="cx"> UnknownBase,
</span><span class="lines">@@ -2284,7 +2284,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (items.size() >= 4)
</span><span class="cx"> return Nullopt;
</span><del>- if (auto item = parseIPv4Number(iterator, didSeeSyntaxViolation))
</del><ins>+ if (auto item = parseIPv4Piece(iterator, didSeeSyntaxViolation))
</ins><span class="cx"> items.append(item.value());
</span><span class="cx"> else
</span><span class="cx"> return Nullopt;
</span><span class="lines">@@ -2323,8 +2323,63 @@
</span><span class="cx"> ipv4 += items[counter] * pow256(3 - counter);
</span><span class="cx"> return ipv4;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> template<typename CharacterType>
</span><ins>+Optional<uint32_t> URLParser::parseIPv4PieceInsideIPv6(CodePointIterator<CharacterType>& iterator)
+{
+ if (iterator.atEnd())
+ return Nullopt;
+ uint32_t piece = 0;
+ bool leadingZeros = false;
+ size_t digitCount = 0;
+ while (!iterator.atEnd()) {
+ if (!isASCIIDigit(*iterator))
+ return Nullopt;
+ ++digitCount;
+ if (!piece && *iterator == '0') {
+ if (leadingZeros)
+ return Nullopt;
+ leadingZeros = true;
+ }
+ if (!piece && *iterator == '0')
+ leadingZeros = true;
+ piece = piece * 10 + *iterator - '0';
+ if (piece > 255)
+ return Nullopt;
+ advance<CharacterType, ReportSyntaxViolation::No>(iterator);
+ if (iterator.atEnd())
+ break;
+ if (*iterator == '.')
+ break;
+ }
+ if (piece && leadingZeros)
+ return Nullopt;
+ return piece;
+}
+
+template<typename CharacterType>
+Optional<URLParser::IPv4Address> URLParser::parseIPv4AddressInsideIPv6(CodePointIterator<CharacterType> iterator)
+{
+ IPv4Address address = 0;
+ for (size_t i = 0; i < 4; ++i) {
+ if (Optional<uint32_t> piece = parseIPv4PieceInsideIPv6(iterator))
+ address = (address << 8) + piece.value();
+ else
+ return Nullopt;
+ if (i < 3) {
+ if (iterator.atEnd())
+ return Nullopt;
+ if (*iterator != '.')
+ return Nullopt;
+ advance<CharacterType, ReportSyntaxViolation::No>(iterator);
+ } else if (!iterator.atEnd())
+ return Nullopt;
+ }
+ ASSERT(iterator.atEnd());
+ return address;
+}
+
+template<typename CharacterType>
</ins><span class="cx"> Optional<URLParser::IPv6Address> URLParser::parseIPv6Host(CodePointIterator<CharacterType> c)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(*c == '[');
</span><span class="lines">@@ -2359,6 +2414,17 @@
</span><span class="cx"> compressPointer = piecePointer;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+ if (piecePointer == 6 || (compressPointer && piecePointer < 6)) {
+ if (Optional<IPv4Address> ipv4Address = parseIPv4AddressInsideIPv6(c)) {
+ if (compressPointer && piecePointer == 5)
+ return Nullopt;
+ syntaxViolation(hostBegin);
+ address[piecePointer++] = ipv4Address.value() >> 16;
+ address[piecePointer++] = ipv4Address.value() & 0xFFFF;
+ c = { };
+ break;
+ }
+ }
</ins><span class="cx"> uint16_t value = 0;
</span><span class="cx"> size_t length = 0;
</span><span class="cx"> bool leadingZeros = false;
</span><span class="lines">@@ -2386,40 +2452,9 @@
</span><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!c.atEnd()) {
- if (piecePointer > 6)
- return Nullopt;
- size_t dotsSeen = 0;
- while (!c.atEnd()) {
- Optional<uint16_t> value;
- if (!isASCIIDigit(*c))
- return Nullopt;
- while (isASCIIDigit(*c)) {
- auto number = *c - '0';
- if (!value)
- value = number;
- else if (!value.value())
- return Nullopt;
- else
- value = value.value() * 10 + number;
- advance(c, hostBegin);
- if (c.atEnd())
- return Nullopt;
- if (value.value() > 255)
- return Nullopt;
- }
- if (dotsSeen < 3 && *c != '.')
- return Nullopt;
- address[piecePointer] = address[piecePointer] * 0x100 + value.valueOr(0);
- if (dotsSeen == 1 || dotsSeen == 3)
- piecePointer++;
- if (!c.atEnd())
- advance(c, hostBegin);
- if (dotsSeen == 3 && !c.atEnd())
- return Nullopt;
- dotsSeen++;
- }
- }
</del><ins>+ if (!c.atEnd())
+ return Nullopt;
+
</ins><span class="cx"> if (compressPointer) {
</span><span class="cx"> size_t swaps = piecePointer - compressPointer.value();
</span><span class="cx"> piecePointer = 7;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (206841 => 206842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-10-06 00:50:59 UTC (rev 206841)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-10-06 02:35:12 UTC (rev 206842)
</span><span class="lines">@@ -100,9 +100,11 @@
</span><span class="cx"> using IPv4Address = uint32_t;
</span><span class="cx"> void serializeIPv4(IPv4Address);
</span><span class="cx"> template<typename CharacterType> Optional<IPv4Address> parseIPv4Host(CodePointIterator<CharacterType>);
</span><del>- template<typename CharacterType> Optional<uint32_t> parseIPv4Number(CodePointIterator<CharacterType>&, bool& syntaxViolation);
</del><ins>+ template<typename CharacterType> Optional<uint32_t> parseIPv4Piece(CodePointIterator<CharacterType>&, bool& syntaxViolation);
</ins><span class="cx"> using IPv6Address = std::array<uint16_t, 8>;
</span><span class="cx"> template<typename CharacterType> Optional<IPv6Address> parseIPv6Host(CodePointIterator<CharacterType>);
</span><ins>+ template<typename CharacterType> Optional<uint32_t> parseIPv4PieceInsideIPv6(CodePointIterator<CharacterType>&);
+ template<typename CharacterType> Optional<IPv4Address> parseIPv4AddressInsideIPv6(CodePointIterator<CharacterType>);
</ins><span class="cx"> void serializeIPv6Piece(uint16_t piece);
</span><span class="cx"> void serializeIPv6(IPv6Address);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206841 => 206842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-06 00:50:59 UTC (rev 206841)
+++ trunk/Tools/ChangeLog 2016-10-06 02:35:12 UTC (rev 206842)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-05 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse IPv4 addresses as the last two pieces of an IPv6 address
+ https://bugs.webkit.org/show_bug.cgi?id=162991
+
+ Reviewed by Saam Barati.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-10-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid automatically re-taking snapshots for back-forward items that were never loaded into the view
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206841 => 206842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-06 00:50:59 UTC (rev 206841)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-06 02:35:12 UTC (rev 206842)
</span><span class="lines">@@ -880,6 +880,81 @@
</span><span class="cx"> checkURLDifferences(utf16String(u"notspecial://H😍ßt"),
</span><span class="cx"> {"notspecial", "", "", "xn--hsst-qc83c", 0, "/", "", "", "notspecial://xn--hsst-qc83c/"},
</span><span class="cx"> {"notspecial", "", "", "xn--hsst-qc83c", 0, "", "", "", "notspecial://xn--hsst-qc83c"}, testTabsValueForSurrogatePairs);
</span><ins>+ checkURLDifferences("http://[ffff:aaaa:cccc:eeee:bbbb:dddd:255.255.255.255]/",
+ {"http", "", "", "[ffff:aaaa:cccc:eeee:bbbb:dddd:ffff:ffff]", 0, "/", "", "", "http://[ffff:aaaa:cccc:eeee:bbbb:dddd:ffff:ffff]/"},
+ {"http", "", "", "[ffff:aaaa:cccc:eeee:bbbb:dddd:255.255.255.255]", 0, "/", "", "", "http://[ffff:aaaa:cccc:eeee:bbbb:dddd:255.255.255.255]/"}, TestTabs::No);
+ checkURLDifferences("http://[::123.234.12.210]/",
+ {"http", "", "", "[::7bea:cd2]", 0, "/", "", "", "http://[::7bea:cd2]/"},
+ {"http", "", "", "[::123.234.12.210]", 0, "/", "", "", "http://[::123.234.12.210]/"});
+ checkURLDifferences("http://[::a:255.255.255.255]/",
+ {"http", "", "", "[::a:ffff:ffff]", 0, "/", "", "", "http://[::a:ffff:ffff]/"},
+ {"http", "", "", "[::a:255.255.255.255]", 0, "/", "", "", "http://[::a:255.255.255.255]/"});
+ checkURLDifferences("http://[::0.00.255.255]/",
+ {"", "", "", "", 0, "", "", "", "http://[::0.00.255.255]/"},
+ {"http", "", "", "[::0.00.255.255]", 0, "/", "", "", "http://[::0.00.255.255]/"});
+ checkURLDifferences("http://[::0.0.255.255]/",
+ {"http", "", "", "[::ffff]", 0, "/", "", "", "http://[::ffff]/"},
+ {"http", "", "", "[::0.0.255.255]", 0, "/", "", "", "http://[::0.0.255.255]/"});
+ checkURLDifferences("http://[::0:1.0.255.255]/",
+ {"http", "", "", "[::100:ffff]", 0, "/", "", "", "http://[::100:ffff]/"},
+ {"http", "", "", "[::0:1.0.255.255]", 0, "/", "", "", "http://[::0:1.0.255.255]/"});
+ checkURLDifferences("http://[::A:1.0.255.255]/",
+ {"http", "", "", "[::a:100:ffff]", 0, "/", "", "", "http://[::a:100:ffff]/"},
+ {"http", "", "", "[::a:1.0.255.255]", 0, "/", "", "", "http://[::a:1.0.255.255]/"});
+ checkURLDifferences("http://[:127.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[:127.0.0.1]"},
+ {"http", "", "", "[:127.0.0.1]", 0, "/", "", "", "http://[:127.0.0.1]/"});
+ checkURLDifferences("http://[127.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[127.0.0.1]"},
+ {"http", "", "", "[127.0.0.1]", 0, "/", "", "", "http://[127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.0.1]",
+ {"http", "", "", "[a:b:c:d:e:f:7f00:1]", 0, "/", "", "", "http://[a:b:c:d:e:f:7f00:1]/"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.0.1]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.0.101]",
+ {"http", "", "", "[a:b:c:d:e:f:7f00:65]", 0, "/", "", "", "http://[a:b:c:d:e:f:7f00:65]/"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.0.101]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.0.101]/"});
+ checkURLDifferences("http://[::a:b:c:d:e:f:127.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[::a:b:c:d:e:f:127.0.0.1]"},
+ {"http", "", "", "[::a:b:c:d:e:f:127.0.0.1]", 0, "/", "", "", "http://[::a:b:c:d:e:f:127.0.0.1]/"});
+ checkURLDifferences("http://[a:b::c:d:e:f:127.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b::c:d:e:f:127.0.0.1]"},
+ {"http", "", "", "[a:b::c:d:e:f:127.0.0.1]", 0, "/", "", "", "http://[a:b::c:d:e:f:127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:127.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:127.0.0.1]"},
+ {"http", "", "", "[a:b:c:d:e:127.0.0.1]", 0, "/", "", "", "http://[a:b:c:d:e:127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f:127.0.0.0.1]"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.0.0.1]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f:127.0.1]"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.1]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.0.011]", // Chrome treats this as octal, Firefox and the spec fail
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f:127.0.0.011]"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.0.011]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.0.011]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.00.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f:127.0.00.1]"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.00.1]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.00.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0.0.1.]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f:127.0.0.1.]"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0.0.1.]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0.0.1.]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f:127.0..0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f:127.0..0.1]"},
+ {"http", "", "", "[a:b:c:d:e:f:127.0..0.1]", 0, "/", "", "", "http://[a:b:c:d:e:f:127.0..0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f::127.0.0.1]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f::127.0.0.1]"},
+ {"http", "", "", "[a:b:c:d:e:f::127.0.0.1]", 0, "/", "", "", "http://[a:b:c:d:e:f::127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e::127.0.0.1]",
+ {"http", "", "", "[a:b:c:d:e:0:7f00:1]", 0, "/", "", "", "http://[a:b:c:d:e:0:7f00:1]/"},
+ {"http", "", "", "[a:b:c:d:e::127.0.0.1]", 0, "/", "", "", "http://[a:b:c:d:e::127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d::e:127.0.0.1]",
+ {"http", "", "", "[a:b:c:d:0:e:7f00:1]", 0, "/", "", "", "http://[a:b:c:d:0:e:7f00:1]/"},
+ {"http", "", "", "[a:b:c:d::e:127.0.0.1]", 0, "/", "", "", "http://[a:b:c:d::e:127.0.0.1]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f::127.0.0.]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f::127.0.0.]"},
+ {"http", "", "", "[a:b:c:d:e:f::127.0.0.]", 0, "/", "", "", "http://[a:b:c:d:e:f::127.0.0.]/"});
+ checkURLDifferences("http://[a:b:c:d:e:f::127.0.0.256]",
+ {"", "", "", "", 0, "", "", "", "http://[a:b:c:d:e:f::127.0.0.256]"},
+ {"http", "", "", "[a:b:c:d:e:f::127.0.0.256]", 0, "/", "", "", "http://[a:b:c:d:e:f::127.0.0.256]/"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span><span class="lines">@@ -1028,6 +1103,10 @@
</span><span class="cx"> shouldFail("http://[1234::ab~]");
</span><span class="cx"> shouldFail("http://[2001::1");
</span><span class="cx"> shouldFail("http://[1:2:3:4:5:6:7:8~]/");
</span><ins>+ shouldFail("http://[a:b:c:d:e:f:g:127.0.0.1]");
+ shouldFail("http://[a:b:c:d:e:f:g:h:127.0.0.1]");
+ shouldFail("http://[a:b:c:d:e:f:127.0.0.0x11]"); // Chrome treats this as hex, Firefox and the spec fail
+ shouldFail("http://[a:b:c:d:e:f:127.0.-0.1]");
</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>