Title: [99157] trunk
Revision
99157
Author
[email protected]
Date
2011-11-03 03:00:37 -0700 (Thu, 03 Nov 2011)

Log Message

Source/WebCore: REGRESSION (r94132): broke fast/loader/location-port.html on GTK
https://bugs.webkit.org/show_bug.cgi?id=67277

Patch by Devdatta Deshpande <[email protected]> on 2011-11-03
Reviewed by Adam Barth.

If port is 0, SoupURI does not have an explicitly specified port. Due
to this port value is ignored in SoupURI. Hence, an extra check is
required to restore the port.

Test: LayoutTests/fast/loader/location-port.html

* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateFromSoupMessage):

LayoutTests: REGRESSION (r94132): broke fast/loader/location-port.html on GTK
https://bugs.webkit.org/show_bug.cgi?id=67277

Patch by Devdatta Deshpande <[email protected]> on 2011-11-03
Reviewed by Adam Barth.

Removed LayoutTests/fast/loader/location-port.html from Skipped tests
for GTK

* platform/gtk/Skipped:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (99156 => 99157)


--- trunk/LayoutTests/ChangeLog	2011-11-03 09:59:32 UTC (rev 99156)
+++ trunk/LayoutTests/ChangeLog	2011-11-03 10:00:37 UTC (rev 99157)
@@ -1,3 +1,15 @@
+2011-11-03  Devdatta Deshpande  <[email protected]>
+
+        REGRESSION (r94132): broke fast/loader/location-port.html on GTK 
+        https://bugs.webkit.org/show_bug.cgi?id=67277
+
+        Reviewed by Adam Barth.
+
+        Removed LayoutTests/fast/loader/location-port.html from Skipped tests
+        for GTK
+
+        * platform/gtk/Skipped:
+
 2011-11-03  Dongwoo Im  <[email protected]>
 
         [EFL] Enable the Page Visibility API.

Modified: trunk/LayoutTests/platform/gtk/Skipped (99156 => 99157)


--- trunk/LayoutTests/platform/gtk/Skipped	2011-11-03 09:59:32 UTC (rev 99156)
+++ trunk/LayoutTests/platform/gtk/Skipped	2011-11-03 10:00:37 UTC (rev 99157)
@@ -1591,9 +1591,6 @@
 # Need layoutTestController.setShouldStayOnPageAfterHandlingBeforeUnload
 fast/loader/form-submission-after-beforeunload-cancel.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=67277
-fast/loader/location-port.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=67398
 platform/gtk/accessibility/combo-box-collapsed-selection-changed.html
 platform/gtk/accessibility/document-reload-events.html

Modified: trunk/Source/WebCore/ChangeLog (99156 => 99157)


--- trunk/Source/WebCore/ChangeLog	2011-11-03 09:59:32 UTC (rev 99156)
+++ trunk/Source/WebCore/ChangeLog	2011-11-03 10:00:37 UTC (rev 99157)
@@ -1,3 +1,19 @@
+2011-11-03  Devdatta Deshpande  <[email protected]>
+
+        REGRESSION (r94132): broke fast/loader/location-port.html on GTK
+        https://bugs.webkit.org/show_bug.cgi?id=67277
+
+        Reviewed by Adam Barth.
+
+        If port is 0, SoupURI does not have an explicitly specified port. Due
+        to this port value is ignored in SoupURI. Hence, an extra check is
+        required to restore the port.
+
+        Test: LayoutTests/fast/loader/location-port.html
+
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateFromSoupMessage):
+
 2011-11-03  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: Allow the toolbar background to be transparent on mac platforms when remote

Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (99156 => 99157)


--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp	2011-11-03 09:59:32 UTC (rev 99156)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp	2011-11-03 10:00:37 UTC (rev 99157)
@@ -85,8 +85,14 @@
 
 void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
 {
+    bool shouldPortBeResetToZero = m_url.hasPort() && !m_url.port();
     m_url = soupURIToKURL(soup_message_get_uri(soupMessage));
 
+    // SoupURI cannot differeniate between an explicitly specified port 0 and
+    // no port specified.
+    if (shouldPortBeResetToZero)
+        m_url.setPort(0);
+
     m_httpMethod = String::fromUTF8(soupMessage->method);
 
     m_httpHeaderFields.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to