<!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>[206942] 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/206942">206942</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-07 16:06:32 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Non-special URL fragments should percent-encode non-ASCII characters
https://bugs.webkit.org/show_bug.cgi?id=163153
Reviewed by Tim Horton.
Source/WebCore:
This is needed to keep compatibility with data URLs with non-ASCII characters after a '#'
which works in Chrome, Firefox, and Safari, while maintaining compatibility with Chrome, IE, and Edge
which keep non-ASCII characters in the fragments of special URLs.
This was proposed to the spec in https://github.com/whatwg/url/issues/150
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::syntaxViolation):
Removed assertion because we now have fragments that need percent encoding but are all ASCII.
(WebCore::URLParser::fragmentSyntaxViolation):
(WebCore::URLParser::parse):
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 (206941 => 206942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-07 22:59:22 UTC (rev 206941)
+++ trunk/Source/WebCore/ChangeLog 2016-10-07 23:06:32 UTC (rev 206942)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-07 Alex Christensen <achristensen@webkit.org>
+
+ Non-special URL fragments should percent-encode non-ASCII characters
+ https://bugs.webkit.org/show_bug.cgi?id=163153
+
+ Reviewed by Tim Horton.
+
+ This is needed to keep compatibility with data URLs with non-ASCII characters after a '#'
+ which works in Chrome, Firefox, and Safari, while maintaining compatibility with Chrome, IE, and Edge
+ which keep non-ASCII characters in the fragments of special URLs.
+ This was proposed to the spec in https://github.com/whatwg/url/issues/150
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::syntaxViolation):
+ Removed assertion because we now have fragments that need percent encoding but are all ASCII.
+ (WebCore::URLParser::fragmentSyntaxViolation):
+ (WebCore::URLParser::parse):
+
</ins><span class="cx"> 2016-10-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> EventHandler functions that need to guarantee event handler lifetime need to use Ref<Frame>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206941 => 206942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-07 22:59:22 UTC (rev 206941)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-07 23:06:32 UTC (rev 206942)
</span><span class="lines">@@ -1019,7 +1019,6 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_asciiBuffer.isEmpty());
</span><span class="cx"> ASSERT(m_unicodeFragmentBuffer.isEmpty());
</span><del>- ASSERT_WITH_MESSAGE(!m_url.m_queryEnd, "syntaxViolation should not be used in the fragment, which might contain non-ASCII code points when serialized");
</del><span class="cx"> size_t codeUnitsToCopy = iterator.codeUnitsSince(reinterpret_cast<const CharacterType*>(m_inputBegin));
</span><span class="cx"> RELEASE_ASSERT(codeUnitsToCopy <= m_inputString.length());
</span><span class="cx"> m_asciiBuffer.reserveCapacity(m_inputString.length());
</span><span class="lines">@@ -1032,10 +1031,10 @@
</span><span class="cx"> template<typename CharacterType>
</span><span class="cx"> void URLParser::fragmentSyntaxViolation(const CodePointIterator<CharacterType>& iterator)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_didSeeUnicodeFragmentCodePoint);
</ins><span class="cx"> if (m_didSeeSyntaxViolation)
</span><span class="cx"> return;
</span><span class="cx"> m_didSeeSyntaxViolation = true;
</span><del>- m_didSeeUnicodeFragmentCodePoint = true;
</del><span class="cx">
</span><span class="cx"> ASSERT(m_asciiBuffer.isEmpty());
</span><span class="cx"> ASSERT(m_unicodeFragmentBuffer.isEmpty());
</span><span class="lines">@@ -1814,22 +1813,32 @@
</span><span class="cx"> case State::Fragment:
</span><span class="cx"> do {
</span><span class="cx"> URL_PARSER_LOG("State Fragment");
</span><del>- if (!m_didSeeUnicodeFragmentCodePoint && isASCII(*c))
- appendToASCIIBuffer(*c);
- else {
- m_didSeeUnicodeFragmentCodePoint = true;
- if (UNLIKELY(m_didSeeSyntaxViolation))
- appendCodePoint(m_unicodeFragmentBuffer, *c);
- else {
- ASSERT(m_asciiBuffer.isEmpty());
- ASSERT(m_unicodeFragmentBuffer.isEmpty());
- }
</del><ins>+ if (!c.atEnd() && isTabOrNewline(*c)) {
+ if (m_didSeeUnicodeFragmentCodePoint)
+ fragmentSyntaxViolation(c);
+ else
+ syntaxViolation(c);
+ ++c;
+ continue;
</ins><span class="cx"> }
</span><ins>+ if (!m_didSeeUnicodeFragmentCodePoint && isASCII(*c)) {
+ if (m_urlIsSpecial)
+ appendToASCIIBuffer(*c);
+ else
+ utf8PercentEncode<isInSimpleEncodeSet>(c);
+ } else {
+ if (m_urlIsSpecial) {
+ m_didSeeUnicodeFragmentCodePoint = true;
+ if (UNLIKELY(m_didSeeSyntaxViolation))
+ appendCodePoint(m_unicodeFragmentBuffer, *c);
+ else {
+ ASSERT(m_asciiBuffer.isEmpty());
+ ASSERT(m_unicodeFragmentBuffer.isEmpty());
+ }
+ } else
+ utf8PercentEncode<isInSimpleEncodeSet>(c);
+ }
</ins><span class="cx"> ++c;
</span><del>- while (UNLIKELY(!c.atEnd() && isTabOrNewline(*c))) {
- fragmentSyntaxViolation(c);
- ++c;
- }
</del><span class="cx"> } while (!c.atEnd());
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206941 => 206942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-07 22:59:22 UTC (rev 206941)
+++ trunk/Tools/ChangeLog 2016-10-07 23:06:32 UTC (rev 206942)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-07 Alex Christensen <achristensen@webkit.org>
+
+ Non-special URL fragments should percent-encode non-ASCII characters
+ https://bugs.webkit.org/show_bug.cgi?id=163153
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-10-07 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix for “Move functionality common to Darwin ports into a base class”
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206941 => 206942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-07 22:59:22 UTC (rev 206941)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-07 23:06:32 UTC (rev 206942)
</span><span class="lines">@@ -329,6 +329,8 @@
</span><span class="cx"> checkURL("foo:#", {"foo", "", "", "", 0, "", "", "", "foo:#"});
</span><span class="cx"> checkURL("A://", {"a", "", "", "", 0, "//", "", "", "a://"});
</span><span class="cx"> checkURL("aA://", {"aa", "", "", "", 0, "//", "", "", "aa://"});
</span><ins>+ checkURL(utf16String(u"foo://host/#ПП\u0007 a</"), {"foo", "", "", "host", 0, "/", "", "%D0%9F%D0%9F%07 a</", "foo://host/#%D0%9F%D0%9F%07 a</"});
+ checkURL(utf16String(u"foo://host/#\u0007 a</"), {"foo", "", "", "host", 0, "/", "", "%07 a</", "foo://host/#%07 a</"});
</ins><span class="cx">
</span><span class="cx"> // This disagrees with the web platform test for http://:@www.example.com but agrees with Chrome and URL::parse,
</span><span class="cx"> // and Firefox fails the web platform test differently. Maybe the web platform test ought to be changed.
</span><span class="lines">@@ -1058,6 +1060,12 @@
</span><span class="cx"> checkURLDifferences("file://:0/path",
</span><span class="cx"> {"", "", "", "", 0, "", "", "", "file://:0/path"},
</span><span class="cx"> {"file", "", "", "", 0, "/path", "", "", "file://:0/path"});
</span><ins>+ checkURLDifferences(utf16String(u"http://host/#ПП\u0007 a</"),
+ {"http", "", "", "host", 0, "/", "", utf16String(u"ПП\u0007 a</"), utf16String(u"http://host/#ПП\u0007 a</")},
+ {"http", "", "", "host", 0, "/", "", "%D0%9F%D0%9F%07 a</", "http://host/#%D0%9F%D0%9F%07 a</"});
+ checkURLDifferences(utf16String(u"http://host/#\u0007 a</"),
+ {"http", "", "", "host", 0, "/", "", "\a a</", "http://host/#\a a</"},
+ {"http", "", "", "host", 0, "/", "", "%07 a</", "http://host/#%07 a</"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void shouldFail(const String& urlString)
</span></span></pre>
</div>
</div>
</body>
</html>