Changeset 84168 in webkit

Timestamp:

Apr 18, 2011 12:23:25 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-18 Andreas Kling <​kling@webkit.org>

Reviewed by Adam Barth.

[Qt] DRT: Unbreak redirection of http:/ URLs.
​https://bugs.webkit.org/show_bug.cgi?id=58779

• platform/qt/Skipped: Unskip http/tests/loading/cross-origin-XHR-willLoadRequest.html

2011-04-18 Andreas Kling <​kling@webkit.org>

Reviewed by Adam Barth.

REGRESSION (r84010): [Qt] DRT: Unbreak redirection of http:/ URLs.
​https://bugs.webkit.org/show_bug.cgi?id=58779

KURL::host() doesn't return the host part of [broken] http:/ URLs, so use
QUrl instead to match the behavior of other ports.

• WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-18  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        [Qt] DRT: Unbreak redirection of http:/ URLs.
+        https://bugs.webkit.org/show_bug.cgi?id=58779
+
+        * platform/qt/Skipped: Unskip http/tests/loading/cross-origin-XHR-willLoadRequest.html
+
 2011-04-18  Chris Rogers  <crogers@google.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -3492 +3492 @@
 http/tests/inspector/network/download.html
 http/tests/inspector/network/x-frame-options-deny.html
-http/tests/loading/cross-origin-XHR-willLoadRequest.html
 http/tests/misc/redirect-to-external-url.html
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-04-18  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        REGRESSION (r84010): [Qt] DRT: Unbreak redirection of http:/ URLs.
+        https://bugs.webkit.org/show_bug.cgi?id=58779
+
+        KURL::host() doesn't return the host part of [broken] http:/ URLs, so use
+        QUrl instead to match the behavior of other ports.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
+
 2011-04-18  Dominic Cooney  <dominicc@chromium.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -1027 +1027 @@
 void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest& newRequest, const WebCore::ResourceResponse& redirectResponse)
 {
-    KURL url = newRequest.url();
+    QUrl url = newRequest.url();
 
     if (dumpResourceLoadCallbacks)
@@ -1047 +1047 @@
 
     if (QWebPagePrivate::drtRun
-        && url.protocolInHTTPFamily()
-        && url.host() != "127.0.0.1"
-        && url.host() != "255.255.255.255"
-        && !equalIgnoringCase(url.host(), "localhost")) {
+        && url.isValid()
+        && (url.scheme().toLower() == QLatin1String("http") || url.scheme().toLower() == QLatin1String("https"))
+        && url.host() != QLatin1String("127.0.0.1")
+        && url.host() != QLatin1String("255.255.255.255")
+        && url.host().toLower() != QLatin1String("localhost")) {
 
         printf("Blocked access to external URL %s\n", qPrintable(drtDescriptionSuitableForTestResult(url)));
@@ -1061 +1062 @@
 
     if (QWebPagePrivate::drtRun) {
-        QMap<QString, QString>::const_iterator it = URLsToRedirect.constFind(url.string());
+        QMap<QString, QString>::const_iterator it = URLsToRedirect.constFind(url.toString());
         if (it != URLsToRedirect.constEnd())
             newRequest.setURL(QUrl(it.value()));