Changeset 116160 in webkit

Timestamp:

May 4, 2012 1:28:16 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[soup] URL of the ResourceResponse passed to willSendRequest is incorrect
​https://bugs.webkit.org/show_bug.cgi?id=85072

Patch by Christophe Dumez <Christophe Dumez> on 2012-05-04
Reviewed by Gustavo Noronha Silva.

Source/WebCore:

Store the response message by catching the "got-headers" signal so
that it can be passed later to willSendRequest() in case of
redirection. This is required because the SoupMessage headers and URL
have already been updated once restartedCallback() is called.

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore):
(WebCore::gotHeadersCallback):
(WebCore::restartedCallback):
(WebCore::sendRequestCallback):
(WebCore::startHTTPRequest):

LayoutTests:

Unskip http/tests/misc/will-send-request-returns-null-on-redirect.html
and http/tests/loading/307-after-303-after-post.html now that the
response passed to willSendRequest is correct and now that the right
redirect URL is being printed in EFL port.

Unfortunately, http/tests/loading/redirect-methods.html cannot be
unskipped yet due to bug 66873.

• platform/efl/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [soup] URL of the ResourceResponse passed to willSendRequest is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=85072
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Unskip http/tests/misc/will-send-request-returns-null-on-redirect.html
+        and http/tests/loading/307-after-303-after-post.html now that the
+        response passed to willSendRequest is correct and now that the right
+        redirect URL is being printed in EFL port.
+
+        Unfortunately, http/tests/loading/redirect-methods.html cannot be
+        unskipped yet due to bug 66873.
+
+        * platform/efl/test_expectations.txt:
+
 2012-05-04  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/platform/efl/test_expectations.txt

@@ -264 +264 @@
 BUGWK85492 : css3/zoom-coords.xhtml = TEXT
 
-// Redirect response URL is not the one expected
-BUGWK85072 : http/tests/misc/will-send-request-returns-null-on-redirect.html = TEXT
-BUGWK85072 : http/tests/loading/307-after-303-after-post.html = TEXT
-BUGWK85072 : http/tests/loading/redirect-methods.html = TEXT
+// Occasionally missing chunks of output
+BUGWK66873:  http/tests/loading/redirect-methods.html = TEXT
 
 // No support for overriding WebKitLoadSiteIconsKey

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [soup] URL of the ResourceResponse passed to willSendRequest is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=85072
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Store the response message by catching the "got-headers" signal so
+        that it can be passed later to willSendRequest() in case of
+        redirection. This is required because the SoupMessage headers and URL
+        have already been updated once restartedCallback() is called.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore):
+        (WebCore::gotHeadersCallback):
+        (WebCore::restartedCallback):
+        (WebCore::sendRequestCallback):
+        (WebCore::startHTTPRequest):
+
 2012-05-04  Ian Vollick  <vollick@chromium.org>
 

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

@@ -216 +216 @@
 }
 
+static void gotHeadersCallback(SoupMessage* msg, gpointer data)
+{
+    ResourceHandle* handle = static_cast<ResourceHandle*>(data);
+    if (!handle)
+        return;
+    ResourceHandleInternal* d = handle->getInternal();
+    if (d->m_cancelled)
+        return;
+
+#if ENABLE(WEB_TIMING)
+    if (d->m_response.resourceLoadTiming())
+        d->m_response.resourceLoadTiming()->receiveHeadersEnd = milisecondsSinceRequest(d->m_response.resourceLoadTiming()->requestTime);
+#endif
+
+    // The original response will be needed later to feed to willSendRequest in
+    // restartedCallback() in case we are redirected. For this reason, so we store it
+    // here.
+    ResourceResponse response;
+    response.updateFromSoupMessage(msg);
+
+    d->m_response = response;
+}
+
 // Called each time the message is going to be sent again except the first time.
 // It's used mostly to let webkit know about redirects.
@@ -232 +255 @@
 
     ResourceRequest request = handle->firstRequest();
-    ResourceResponse response;
     request.setURL(newURL);
     request.setHTTPMethod(msg->method);
-    response.updateFromSoupMessage(msg);
 
     // Should not set Referer after a redirect from a secure resource to non-secure one.
@@ -244 +265 @@
 
     if (d->client())
-        d->client()->willSendRequest(handle, request, response);
+        d->client()->willSendRequest(handle, request, d->m_response);
 
     if (d->m_cancelled)
@@ -345 +366 @@
         return;
     }
-
-#if ENABLE(WEB_TIMING)
-    if (d->m_response.resourceLoadTiming())
-        d->m_response.resourceLoadTiming()->receiveHeadersEnd = milisecondsSinceRequest(d->m_response.resourceLoadTiming()->requestTime);
-#endif
 
     GOwnPtr<GError> error;
@@ -613 +629 @@
         soup_message_disable_feature(soupMessage, SOUP_TYPE_CONTENT_SNIFFER);
 
+    g_signal_connect(soupMessage, "got-headers", G_CALLBACK(gotHeadersCallback), handle);
     g_signal_connect(soupMessage, "restarted", G_CALLBACK(restartedCallback), handle);
     g_signal_connect(soupMessage, "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle);