Changeset 69946 in webkit

Timestamp:

Oct 18, 2010, 1:15:25 AM (15 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-10-17 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Support custom open() verbs/methods in XMLHttpRequest
​https://bugs.webkit.org/show_bug.cgi?id=40476

Fall back to QNetworkAccessManager::CustomOperation for any HTTP verb
that's not specifically supported by QNetworkAccessManager.

This prevents the infinite loop that otherwise occurs after sending
an UnknownOperation request.

This change is covered by existing (skipped) tests that will be
unskipped once the Qt bots are running Qt 4.7.

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

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/qt/QNetworkReplyHandler.cpp (modified) (4 diffs)
• platform/network/qt/QNetworkReplyHandler.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-17  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Support custom open() verbs/methods in XMLHttpRequest
+        https://bugs.webkit.org/show_bug.cgi?id=40476
+
+        Fall back to QNetworkAccessManager::CustomOperation for any HTTP verb
+        that's not specifically supported by QNetworkAccessManager.
+
+        This prevents the infinite loop that otherwise occurs after sending
+        an UnknownOperation request.
+
+        This change is covered by existing (skipped) tests that will be
+        unskipped once the Qt bots are running Qt 4.7.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::httpMethod):
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+        * platform/network/qt/QNetworkReplyHandler.h:
+
 2010-10-17  Adam Barth  <abarth@webkit.org>
 

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

@@ -156 +156 @@
 }
 
-static QString httpMethodString(QNetworkAccessManager::Operation method)
-{
-    switch (method) {
+String QNetworkReplyHandler::httpMethod() const
+{
+    switch (m_method) {
     case QNetworkAccessManager::GetOperation:
         return "GET";
@@ -167 +167 @@
     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";
+        return m_resourceHandle->firstRequest().httpMethod();
 #endif
     default:
+        ASSERT_NOT_REACHED();
         return "GET";
     }
@@ -207 +206 @@
         m_method = QNetworkAccessManager::DeleteOperation;
 #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
-    else if (r.httpMethod() == "OPTIONS")
+    else
         m_method = QNetworkAccessManager::CustomOperation;
-#endif
+#else
     else
         m_method = QNetworkAccessManager::UnknownOperation;
+#endif
 
     QObject* originatingObject = 0;
@@ -411 +411 @@
 
         ResourceRequest newRequest = m_resourceHandle->firstRequest();
-        newRequest.setHTTPMethod(httpMethodString(m_method));
+        newRequest.setHTTPMethod(httpMethod());
         newRequest.setURL(newUrl);
 

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

@@ -68 +68 @@
     void start();
     void resetState();
+    String httpMethod() const;
 
     QNetworkReply* m_reply;