Changeset 117071 in webkit

Timestamp:

May 15, 2012 8:34:09 AM (12 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] http/tests/xmlhttprequest/xmlhttprequest-check-head-readystate-for-404.html times out
​https://bugs.webkit.org/show_bug.cgi?id=84016

Reviewed by Simon Hausmann.

Source/WebCore:

Calling didFail abort the connection and doesn't activate the HEADERS_RECEIVED state.
Since the goal of HEAD is to test then the request should be marked as finished
also in cases of HTTP errors.
This matches other ports behavior.

• platform/network/qt/QNetworkReplyHandler.cpp:

(WebCore::shouldIgnoreHttpError):

LayoutTests:

• platform/qt/Skipped:

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] http/tests/xmlhttprequest/xmlhttprequest-check-head-readystate-for-404.html times out
+        https://bugs.webkit.org/show_bug.cgi?id=84016
+
+        Reviewed by Simon Hausmann.
+
+        * platform/qt/Skipped:
+
 2012-05-15  Dinu Jacob  <dinu.jacob@nokia.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -652 +652 @@
 # https://bugs.webkit.org/show_bug.cgi?id=72252
 http/tests/misc/xslt-bad-import.html
-
-# [Qt] http/tests/xmlhttprequest/xmlhttprequest-check-head-readystate-for-404.html times out
-# https://bugs.webkit.org/show_bug.cgi?id=84016
-http/tests/xmlhttprequest/xmlhttprequest-check-head-readystate-for-404.html
 
 # =========================================================================== #

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] http/tests/xmlhttprequest/xmlhttprequest-check-head-readystate-for-404.html times out
+        https://bugs.webkit.org/show_bug.cgi?id=84016
+
+        Reviewed by Simon Hausmann.
+
+        Calling didFail abort the connection and doesn't activate the HEADERS_RECEIVED state.
+        Since the goal of HEAD is to test then the request should be marked as finished
+        also in cases of HTTP errors.
+        This matches other ports behavior.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::shouldIgnoreHttpError):
+
 2012-05-15  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

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

@@ -421 +421 @@
 static bool shouldIgnoreHttpError(QNetworkReply* reply, bool receivedData)
 {
+    // An HEAD XmlHTTPRequest shouldn't be marked as failure for HTTP errors.
+    if (reply->operation() == QNetworkAccessManager::HeadOperation)
+        return true;
+
     int httpStatusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();