Changeset 57085 in webkit

Timestamp:

Apr 5, 2010 10:57:00 AM (14 years ago)

Author:

robert@webkit.org

Message:

2010-04-05 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde-Christiansen.

[Qt] Fix infinite redirection loop in QNetworkReplyHandler

Qt enters an infinite loop if a redirect response redirects to itself.

Fixes http/tests/xmlhttprequest/connection-error-sync.html

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

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

2010-04-05 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde-Christiansen.

[Qt] Fix infinite redirection loop in QNetworkReplyHandler

Unskip http/tests/xmlhttprequest/connection-error-sync.html

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

• platform/qt/Skipped:

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) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-05  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde-Christiansen.
+
+        [Qt] Fix infinite redirection loop in QNetworkReplyHandler
+
+        Unskip http/tests/xmlhttprequest/connection-error-sync.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=37097
+
+        * platform/qt/Skipped:
+
 2010-04-05  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5016 +5016 @@
 http/tests/xmlhttprequest/access-control-response-with-body-sync.html
 http/tests/xmlhttprequest/cache-override.html
-http/tests/xmlhttprequest/connection-error-sync.html
 http/tests/xmlhttprequest/cookies.html
 http/tests/xmlhttprequest/methods-lower-case.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-05  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde-Christiansen.
+
+        [Qt] Fix infinite redirection loop in QNetworkReplyHandler
+
+        Qt enters an infinite loop if a redirect response redirects to itself.
+
+        Fixes http/tests/xmlhttprequest/connection-error-sync.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=37097
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
 2010-04-05  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -336 +336 @@
     QUrl redirection = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if (redirection.isValid()) {
+        QUrl newUrl = m_reply->url().resolved(redirection);
+        if (newUrl == m_reply->url()) { // avoid redirecting to the same url as it causes infinite recursion
+            ResourceError error(newUrl.host(), 400 /*bad request*/,
+                                newUrl.toString(),
+                                QCoreApplication::translate("QWebPage", "Infinite recursion in redirection request"));
+            client->didFail(m_resourceHandle, error);
+            return;
+        }
+
         m_redirected = true;
 
-        QUrl newUrl = m_reply->url().resolved(redirection);
         ResourceRequest newRequest = m_resourceHandle->request();
         newRequest.setURL(newUrl);