Changeset 89213 in webkit

Timestamp:

Jun 19, 2011 3:53:03 AM (13 years ago)

Author:

robert@webkit.org

Message:

2011-06-19 Robert Hogan <​robert@webkit.org>

Reviewed by Alexey Proskuryakov.

[Qt] Qt Counterpart for ​http://trac.webkit.org/changeset/42078
​https://bugs.webkit.org/show_bug.cgi?id=62514

• platform/qt/Skipped: Unskip http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html

2011-06-19 Robert Hogan <​robert@webkit.org>

Reviewed by Alexey Proskuryakov.

[Qt] Qt Counterpart for ​http://trac.webkit.org/changeset/42078
​https://bugs.webkit.org/show_bug.cgi?id=62514

• platform/network/qt/ResourceHandleQt.cpp: (WebCore::WebCoreSynchronousLoader::willSendRequest):

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/ResourceHandleQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-19  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        [Qt] Qt Counterpart for http://trac.webkit.org/changeset/42078
+        https://bugs.webkit.org/show_bug.cgi?id=62514
+
+        * platform/qt/Skipped: Unskip http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html
+
 2011-06-18  Yufeng Shen  <miletus@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -368 +368 @@
 http/tests/xmlhttprequest/cross-origin-authorization.html
 http/tests/xmlhttprequest/cross-origin-no-authorization.html
-http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html
 
 # =========================================================================== #

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-19  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        [Qt] Qt Counterpart for http://trac.webkit.org/changeset/42078
+        https://bugs.webkit.org/show_bug.cgi?id=62514
+
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::WebCoreSynchronousLoader::willSendRequest):
+
 2011-06-18  Yufeng Shen  <miletus@chromium.org>
 

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

@@ -60 +60 @@
     {}
 
+    virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse&);
     virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse& response) { m_response = response; }
     virtual void didReceiveData(ResourceHandle*, const char* data, int length, int) { m_data.append(data, length); }
@@ -69 +70 @@
     Vector<char>& m_data;
 };
+
+void WebCoreSynchronousLoader::willSendRequest(ResourceHandle* handle, ResourceRequest& request, const ResourceResponse& /*redirectResponse*/)
+{
+    // FIXME: This needs to be fixed to follow the redirect correctly even for cross-domain requests.
+    if (!protocolHostAndPortAreEqual(handle->firstRequest().url(), request.url())) {
+        ASSERT(m_error.isNull());
+        m_error.setIsCancellation(true);
+        request = ResourceRequest();
+        return;
+    }
+}
 
 ResourceHandleInternal::~ResourceHandleInternal()