Changeset 99157 in webkit

Timestamp:

Nov 3, 2011, 3:00:37 AM (14 years ago)

Author:

commit-queue@webkit.org

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 <​webkit.devdatta@gmail.com> 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 <​webkit.devdatta@gmail.com> on 2011-11-03
Reviewed by Adam Barth.

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

• platform/gtk/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-03  Devdatta Deshpande  <webkit.devdatta@gmail.com>
+
+        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  <dw.im@samsung.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -1592 +1592 @@
 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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-03  Devdatta Deshpande  <webkit.devdatta@gmail.com>
+
+        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  <pecoraro@apple.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp

@@ -86 +86 @@
 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);