Changeset 211105 in webkit

Timestamp:

Jan 24, 2017, 1:22:56 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211058. rdar://problem/29526875

Location:

branches/safari-603-branch

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) (1 diff)

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211058. rdar://problem/29526875
+
+    2017-01-23  Alex Christensen  <achristensen@webkit.org>
+
+            Make URLs with non-special schemes and a query or fragment but no slash after the host more compatible
+            https://bugs.webkit.org/show_bug.cgi?id=167317
+            <rdar://problem/29526875>
+
+            Reviewed by Sam Weinig.
+
+            This is currently being added to the URL spec in https://github.com/whatwg/url/issues/212
+            Covered by new API tests.
+
+            * platform/URLParser.cpp:
+            (WebCore::URLParser::parse):
+            Only add a slash if there wasn't one if the URL has a special scheme.
+            This new behavior matches the old behavior of URL::parse.
+
 2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/platform/URLParser.cpp

@@ -1451 +1451 @@
                         }
                         if (UNLIKELY(!isSlash)) {
-                            syntaxViolation(c);
-                            appendToASCIIBuffer('/');
+                            if (m_urlIsSpecial) {
+                                syntaxViolation(c);
+                                appendToASCIIBuffer('/');
+                            }
                             m_url.m_pathAfterLastSlash = currentPosition(c);
                         }

branches/safari-603-branch/Tools/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211058. rdar://problem/29526875
+
+    2017-01-23  Alex Christensen  <achristensen@webkit.org>
+
+            Make URLs with non-special schemes and a query or fragment but no slash after the host more compatible
+            https://bugs.webkit.org/show_bug.cgi?id=167317
+
+            Reviewed by Sam Weinig.
+
+            * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+            (TestWebKitAPI::TEST_F):
+
 2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

@@ -631 +631 @@
     checkRelativeURL("?query", "applewebdata://Host", {"applewebdata", "", "", "Host", 0, "", "query", "", "applewebdata://Host?query"});
     checkRelativeURL("#fragment", "applewebdata://Host", {"applewebdata", "", "", "Host", 0, "", "", "fragment", "applewebdata://Host#fragment"});
+    checkRelativeURL("notspecial://something?", "file:////var//containers//stuff/", {"notspecial", "", "", "something", 0, "", "", "", "notspecial://something?"}, TestTabs::No);
+    checkRelativeURL("notspecial://something#", "file:////var//containers//stuff/", {"notspecial", "", "", "something", 0, "", "", "", "notspecial://something#"}, TestTabs::No);
+    checkRelativeURL("http://something?", "file:////var//containers//stuff/", {"http", "", "", "something", 0, "/", "", "", "http://something/?"}, TestTabs::No);
+    checkRelativeURL("http://something#", "file:////var//containers//stuff/", {"http", "", "", "something", 0, "/", "", "", "http://something/#"}, TestTabs::No);
 
     // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,