Title: [206878] trunk
Revision
206878
Author
achristen...@apple.com
Date
2016-10-06 13:46:04 -0700 (Thu, 06 Oct 2016)

Log Message

URLParser should parse file URLs with ports consistently
https://bugs.webkit.org/show_bug.cgi?id=163075

Reviewed by Brady Eidson.

Source/WebCore:

Covered by API tests.  We used to assert when parsing the newly tested URLs.

* platform/URLParser.cpp:
(WebCore::URLParser::parse):

Tools:

* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (206877 => 206878)


--- trunk/Source/WebCore/ChangeLog	2016-10-06 20:22:16 UTC (rev 206877)
+++ trunk/Source/WebCore/ChangeLog	2016-10-06 20:46:04 UTC (rev 206878)
@@ -1,3 +1,15 @@
+2016-10-06  Alex Christensen  <achristen...@webkit.org>
+
+        URLParser should parse file URLs with ports consistently
+        https://bugs.webkit.org/show_bug.cgi?id=163075
+
+        Reviewed by Brady Eidson.
+
+        Covered by API tests.  We used to assert when parsing the newly tested URLs.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parse):
+
 2016-10-06  Chris Dumez  <cdu...@apple.com>
 
         [WebIDL] Add support for having dictionaries in their own IDL file

Modified: trunk/Source/WebCore/platform/URLParser.cpp (206877 => 206878)


--- trunk/Source/WebCore/platform/URLParser.cpp	2016-10-06 20:22:16 UTC (rev 206877)
+++ trunk/Source/WebCore/platform/URLParser.cpp	2016-10-06 20:46:04 UTC (rev 206878)
@@ -1991,7 +1991,7 @@
             m_url.m_portEnd = m_url.m_hostEnd;
         }
         appendToASCIIBuffer('/');
-        m_url.m_pathAfterLastSlash = m_url.m_hostEnd + 1;
+        m_url.m_pathAfterLastSlash = m_url.m_portEnd + 1;
         m_url.m_pathEnd = m_url.m_pathAfterLastSlash;
         m_url.m_queryEnd = m_url.m_pathAfterLastSlash;
         m_url.m_fragmentEnd = m_url.m_pathAfterLastSlash;

Modified: trunk/Tools/ChangeLog (206877 => 206878)


--- trunk/Tools/ChangeLog	2016-10-06 20:22:16 UTC (rev 206877)
+++ trunk/Tools/ChangeLog	2016-10-06 20:46:04 UTC (rev 206878)
@@ -1,3 +1,13 @@
+2016-10-06  Alex Christensen  <achristen...@webkit.org>
+
+        URLParser should parse file URLs with ports consistently
+        https://bugs.webkit.org/show_bug.cgi?id=163075
+
+        Reviewed by Brady Eidson.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-10-06  John Wilander  <wilan...@apple.com>
 
         Update Resource Load Statistics

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206877 => 206878)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp	2016-10-06 20:22:16 UTC (rev 206877)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp	2016-10-06 20:46:04 UTC (rev 206878)
@@ -1044,6 +1044,16 @@
     checkURLDifferences("unknown://host:81",
         {"unknown", "", "", "host", 81, "/", "", "", "unknown://host:81/"},
         {"unknown", "", "", "host", 81, "", "", "", "unknown://host:81"});
+
+    checkURL("file://host:0", {"file", "", "", "host", 0, "/", "", "", "file://host:0/"});
+    checkURL("file://host:80", {"file", "", "", "host", 80, "/", "", "", "file://host:80/"});
+    checkURL("file://host:80/path", {"file", "", "", "host", 80, "/path", "", "", "file://host:80/path"});
+    checkURLDifferences("file://:80/path",
+        {"", "", "", "", 0, "", "", "", "file://:80/path"},
+        {"file", "", "", "", 80, "/path", "", "", "file://:80/path"});
+    checkURLDifferences("file://:0/path",
+        {"", "", "", "", 0, "", "", "", "file://:0/path"},
+        {"file", "", "", "", 0, "/path", "", "", "file://:0/path"});
 }
     
 static void shouldFail(const String& urlString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to