Changeset 68906 in webkit

Timestamp:

Oct 1, 2010 11:40:19 AM (14 years ago)

Author:

robert@webkit.org

Message:

2010-10-01 Robert Hogan <​robert@webkit.org>

Reviewed by Adam Barth.

[Qt] Fix http/tests/loading/redirect-methods.html

​https://bugs.webkit.org/show_bug.cgi?id=41571

Unskip http/tests/loading/redirect-methods.html

• platform/qt/Skipped:

2010-10-01 Robert Hogan <​robert@webkit.org>

Reviewed by Adam Barth.

[Qt] Fix http/tests/loading/redirect-methods.html

Document our redirection behaviour too.

​https://bugs.webkit.org/show_bug.cgi?id=41571

• platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyHandler::QNetworkReplyHandler): (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
• platform/network/qt/QNetworkReplyHandler.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/qt/QNetworkReplyHandler.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-01  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Fix http/tests/loading/redirect-methods.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=41571
+
+        Unskip http/tests/loading/redirect-methods.html
+ 
+        * platform/qt/Skipped:
+
 2010-09-30  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -182 +182 @@
 # https://bugs.webkit.org/show_bug.cgi?id=44282
 http/tests/incremental/slow-utf8-text.pl
-
-# webkit.org/b/41571
-http/tests/loading/redirect-methods.html
 
 # expected results need updating

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-01  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Fix http/tests/loading/redirect-methods.html
+
+        Document our redirection behaviour too.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41571
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+        * platform/network/qt/QNetworkReplyHandler.h:
+
 2010-10-01  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

@@ -136 +136 @@
 {
     return true;
+}
+
+static QString httpMethodString(QNetworkAccessManager::Operation method)
+{
+    switch (method) {
+    case QNetworkAccessManager::GetOperation:
+        return "GET";
+    case QNetworkAccessManager::HeadOperation:
+        return "HEAD";
+    case QNetworkAccessManager::PostOperation:
+        return "POST";
+    case QNetworkAccessManager::PutOperation:
+        return "PUT";
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    case QNetworkAccessManager::DeleteOperation:
+        return "DELETE";
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+    case QNetworkAccessManager::CustomOperation:
+        return "OPTIONS";
+#endif
+    default:
+        return "GET";
+    }
 }
 
@@ -360 +384 @@
         m_redirected = true;
 
+
+        //  Status Code 301 (Moved Permanently), 302 (Moved Temporarily), 303 (See Other):
+        //    - If original request is POST convert to GET and redirect automatically
+        //  Status Code 307 (Temporary Redirect) and all other redirect status codes:
+        //    - Use the HTTP method from the previous request
+        if ((statusCode >= 301 && statusCode <= 303) && m_resourceHandle->firstRequest().httpMethod() == "POST")
+            m_method = QNetworkAccessManager::GetOperation;
+
         ResourceRequest newRequest = m_resourceHandle->firstRequest();
+        newRequest.setHTTPMethod(httpMethodString(m_method));
         newRequest.setURL(newUrl);
-
-        if (((statusCode >= 301 && statusCode <= 303) || statusCode == 307) && newRequest.httpMethod() == "POST") {
-            m_method = QNetworkAccessManager::GetOperation;
-            newRequest.setHTTPMethod("GET");
-        }
 
         // Should not set Referer after a redirect from a secure resource to non-secure one.