Changeset 143352 in webkit

Timestamp:

Feb 19, 2013 10:28:11 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][DRT] http/tests/loading/307-after-303-after-post.html times out
​https://bugs.webkit.org/show_bug.cgi?id=93214

Source/WebCore:

Ensured that GET verb is consistently used for any request
coming after a redirection that triggers switching to GET.

Patch by Youenn Fablet <​youennf@gmail.com> on 2013-02-19
Reviewed by Martin Robinson.

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::doRedirect):

LayoutTests:

Removed Failure from potential outcome of
http/tests/loading/307-after-303-after-post.html test.

Patch by Youenn Fablet <​youennf@gmail.com> on 2013-02-19
Reviewed by Martin Robinson.

• platform/efl/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-19  Youenn Fablet  <youennf@gmail.com>
+
+        [EFL][DRT] http/tests/loading/307-after-303-after-post.html times out
+        https://bugs.webkit.org/show_bug.cgi?id=93214
+
+        Removed Failure from potential outcome of
+        http/tests/loading/307-after-303-after-post.html test.
+
+        Reviewed by Martin Robinson.
+
+        * platform/efl/TestExpectations:
+
 2013-02-19  Ádám Kallai  <kadam@inf.u-szeged.hu>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -761 +761 @@
 
 webkit.org/b/93213 fast/text/international/text-spliced-font.html [ Failure Pass ]
-webkit.org/b/93214 http/tests/loading/307-after-303-after-post.html [ Crash Failure Pass Timeout ]
+webkit.org/b/93214 http/tests/loading/307-after-303-after-post.html [ Crash Pass Timeout ]
 webkit.org/b/93212 http/tests/incremental/slow-utf8-text.pl [ Pass Timeout ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Youenn Fablet  <youennf@gmail.com>
+
+        [EFL][DRT] http/tests/loading/307-after-303-after-post.html times out
+        https://bugs.webkit.org/show_bug.cgi?id=93214
+
+        Ensured that GET verb is consistently used for any request
+        coming after a redirection that triggers switching to GET.
+
+        Reviewed by Martin Robinson.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::doRedirect):
+
 2013-02-19  Andras Becsi  <andras.becsi@digia.com>
 

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

@@ -454 +454 @@
     }
 
-    ResourceRequest request = handle->firstRequest();
+    ResourceRequest newRequest = handle->firstRequest();
     SoupMessage* message = d->m_soupMessage.get();
     const char* location = soup_message_headers_get_one(message->response_headers, "Location");
     KURL newURL = KURL(soupURIToKURL(soup_message_get_uri(message)), location);
-    bool crossOrigin = !protocolHostAndPortAreEqual(request.url(), newURL);
-    request.setURL(newURL);
-
-    if (shouldRedirectAsGET(message, newURL, crossOrigin)) {
-        request.setHTTPMethod("GET");
-        request.setHTTPBody(0);
-        request.clearHTTPContentType();
+    bool crossOrigin = !protocolHostAndPortAreEqual(handle->firstRequest().url(), newURL);
+    newRequest.setURL(newURL);
+
+    if (newRequest.httpMethod() != "GET") {
+        // Change newRequest method to GET if change was made during a previous redirection
+        // or if current redirection says so
+        if (message->method == SOUP_METHOD_GET || shouldRedirectAsGET(message, newURL, crossOrigin)) {
+            newRequest.setHTTPMethod("GET");
+            newRequest.setHTTPBody(0);
+            newRequest.clearHTTPContentType();
+        }
     }
 
     // Should not set Referer after a redirect from a secure resource to non-secure one.
-    if (!newURL.protocolIs("https") && protocolIs(request.httpReferrer(), "https") && handle->context()->shouldClearReferrerOnHTTPSToHTTPRedirect())
-        request.clearHTTPReferrer();
+    if (!newURL.protocolIs("https") && protocolIs(newRequest.httpReferrer(), "https") && handle->context()->shouldClearReferrerOnHTTPSToHTTPRedirect())
+        newRequest.clearHTTPReferrer();
 
     d->m_user = newURL.user();
     d->m_pass = newURL.pass();
-    request.removeCredentials();
+    newRequest.removeCredentials();
 
     if (crossOrigin) {
         // If the network layer carries over authentication headers from the original request
         // in a cross-origin redirect, we want to clear those headers here. 
-        request.clearHTTPAuthorization();
+        newRequest.clearHTTPAuthorization();
 
         // TODO: We are losing any username and password specified in the redirect URL, as this is the 
         // same behavior as the CFNet port. We should investigate if this is really what we want.
     } else
-        applyAuthenticationToRequest(handle, request, true);
+        applyAuthenticationToRequest(handle, newRequest, true);
 
     cleanupSoupRequestOperation(handle);
-    if (!createSoupRequestAndMessageForHandle(handle, request, true)) {
+    if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
         d->client()->cannotShowURL(handle);
         return;
@@ -493 +497 @@
     // If we sent credentials with this request's URL, we don't want the response to carry them to
     // the WebKit layer. They were only placed in the URL for the benefit of libsoup.
-    request.removeCredentials();
-
-    d->client()->willSendRequest(handle, request, d->m_response);
+    newRequest.removeCredentials();
+
+    d->client()->willSendRequest(handle, newRequest, d->m_response);
     handle->sendPendingRequest();
 }