Changeset 55448 in webkit

Timestamp:

Mar 2, 2010 6:53:28 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-02 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Support the HTTP OPTIONS verb (needed for preflight requests)

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

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

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-02  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Support the HTTP OPTIONS verb (needed for preflight requests)
+
+        https://bugs.webkit.org/show_bug.cgi?id=34647
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        (WebCore::QNetworkReplyHandler::start):
+
 2010-03-02  Evan Stade  <estade@chromium.org>
 

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

@@ -22 +22 @@
 #include "QNetworkReplyHandler.h"
 
+#include "CString.h"
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
@@ -152 +153 @@
     else if (r.httpMethod() == "DELETE")
         m_method = QNetworkAccessManager::DeleteOperation;
+#endif
+#if QT_VERSION >= 0x040700
+    else if (r.httpMethod() == "OPTIONS")
+        m_method = QNetworkAccessManager::CustomOperation;
 #endif
     else
@@ -438 +443 @@
         }
 #endif
+#if QT_VERSION >= 0x040700
+        case QNetworkAccessManager::CustomOperation:
+            m_reply = manager->sendCustomRequest(m_request, m_resourceHandle->request().httpMethod().latin1().data());
+            break;
+#endif
         case QNetworkAccessManager::UnknownOperation: {
             m_reply = 0;