Changeset 206219 in webkit

Timestamp:

Sep 21, 2016 11:02:52 AM (8 years ago)

Author:

achristensen@apple.com

Message:

URLParser: Correctly parse URLs that are just nonspecialscheme:/
​https://bugs.webkit.org/show_bug.cgi?id=162340

Reviewed by Tim Horton.

Source/WebCore:

Covered by new API tests.

• platform/URLParser.cpp:

(WebCore::URLParser::parse):
r206162 wasn't quite right. If a url is just nonspecialscheme:/ then the path should indeed be /

Tools:

• TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-21  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser: Correctly parse URLs that are just nonspecialscheme:/
+        https://bugs.webkit.org/show_bug.cgi?id=162340
+
+        Reviewed by Tim Horton.
+
+        Covered by new API tests.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parse):
+        r206162 wasn't quite right.  If a url is just nonspecialscheme:/ then the path should indeed be /
+
 2016-09-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -1474 +1474 @@
     case State::PathOrAuthority:
         LOG_FINAL_STATE("PathOrAuthority");
-        m_url.m_userEnd = m_asciiBuffer.size();
-        m_url.m_passwordEnd = m_url.m_userEnd;
-        m_url.m_hostEnd = m_url.m_userEnd;
-        m_url.m_portEnd = m_url.m_userEnd;
-        m_url.m_pathAfterLastSlash = m_url.m_userEnd;
+        ASSERT(m_url.m_userStart);
+        ASSERT(m_url.m_userStart == m_asciiBuffer.size());
+        ASSERT(m_asciiBuffer.last() == '/');
+        m_url.m_userStart--;
+        m_url.m_userEnd = m_url.m_userStart;
+        m_url.m_passwordEnd = m_url.m_userStart;
+        m_url.m_hostEnd = m_url.m_userStart;
+        m_url.m_portEnd = m_url.m_userStart;
+        m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
         m_url.m_pathEnd = m_url.m_pathAfterLastSlash;
         m_url.m_queryEnd = m_url.m_pathAfterLastSlash;

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-21  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser: Correctly parse URLs that are just nonspecialscheme:/
+        https://bugs.webkit.org/show_bug.cgi?id=162340
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-09-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

@@ -216 +216 @@
     checkURL("notspecial:/a", {"notspecial", "", "", "", 0, "/a", "", "", "notspecial:/a"});
     checkURL("notspecial:", {"notspecial", "", "", "", 0, "", "", "", "notspecial:"});
+    checkURL("notspecial:/", {"notspecial", "", "", "", 0, "/", "", "", "notspecial:/"});
 
     // This disagrees with the web platform test for http://:@www.example.com but agrees with Chrome and URL::parse,
@@ -303 +304 @@
     checkRelativeURL("!", "sc://ho/pa", {"sc", "", "", "ho", 0, "/!", "", "", "sc://ho/!"});
     checkRelativeURL("!", "sc:/ho/pa", {"sc", "", "", "", 0, "/ho/!", "", "", "sc:/ho/!"});
-    
+    checkRelativeURL("notspecial:/", "about:blank", {"notspecial", "", "", "", 0, "/", "", "", "notspecial:/"});
+    checkRelativeURL("notspecial:/", "http://host", {"notspecial", "", "", "", 0, "/", "", "", "notspecial:/"});
+    checkRelativeURL("foo:/", "http://example.org/foo/bar", {"foo", "", "", "", 0, "/", "", "", "foo:/"});
+
     // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,
     // but it is included in the web platform tests.
@@ -568 +572 @@
         {"http", "", "", "host", 0, "/", "%C3%9F%F0%9F%98%8D", wideString(L"ß😍"), wideString(L"http://host/?%C3%9F%F0%9F%98%8D#ß😍")},
         {"http", "", "", "host", 0, "/", "%C3%9F%F0%9F%98%8D", "%C3%9F%F0%9F%98%8D", "http://host/?%C3%9F%F0%9F%98%8D#%C3%9F%F0%9F%98%8D"});
-
-    // This matches the spec and web platform tests, but not Chrome, Firefox, or URL::parse.
-    checkRelativeURLDifferences("notspecial:/", "about:blank",
-        {"notspecial", "", "", "", 0, "", "", "", "notspecial:/"},
-        {"notspecial", "", "", "", 0, "/", "", "", "notspecial:/"});
-    checkRelativeURLDifferences("notspecial:/", "http://host",
-        {"notspecial", "", "", "", 0, "", "", "", "notspecial:/"},
-        {"notspecial", "", "", "", 0, "/", "", "", "notspecial:/"});
-    checkURLDifferences("notspecial:/",
-        {"notspecial", "", "", "", 0, "", "", "", "notspecial:/"},
-        {"notspecial", "", "", "", 0, "/", "", "", "notspecial:/"});
 }