Title: [89154] trunk
- Revision
- 89154
- Author
- rob...@webkit.org
- Date
- 2011-06-17 12:09:51 -0700 (Fri, 17 Jun 2011)
Log Message
2011-06-12 Robert Hogan <rob...@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-12 Robert Hogan <rob...@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):
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (89153 => 89154)
--- trunk/LayoutTests/ChangeLog 2011-06-17 18:58:31 UTC (rev 89153)
+++ trunk/LayoutTests/ChangeLog 2011-06-17 19:09:51 UTC (rev 89154)
@@ -1,3 +1,12 @@
+2011-06-12 Robert Hogan <rob...@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-17 Ryosuke Niwa <rn...@webkit.org>
Chromium Mac rebaselines for r89091.
Modified: trunk/LayoutTests/platform/qt/Skipped (89153 => 89154)
--- trunk/LayoutTests/platform/qt/Skipped 2011-06-17 18:58:31 UTC (rev 89153)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-06-17 19:09:51 UTC (rev 89154)
@@ -367,7 +367,6 @@
http/tests/xmlhttprequest/cache-override.html
http/tests/xmlhttprequest/cross-origin-authorization.html
http/tests/xmlhttprequest/cross-origin-no-authorization.html
-http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html
# =========================================================================== #
# Failing inserting tests. #
Modified: trunk/Source/WebCore/ChangeLog (89153 => 89154)
--- trunk/Source/WebCore/ChangeLog 2011-06-17 18:58:31 UTC (rev 89153)
+++ trunk/Source/WebCore/ChangeLog 2011-06-17 19:09:51 UTC (rev 89154)
@@ -1,3 +1,13 @@
+2011-06-12 Robert Hogan <rob...@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-17 Mark Pilgrim <pilg...@chromium.org>
Reviewed by Adam Barth.
Modified: trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp (89153 => 89154)
--- trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2011-06-17 18:58:31 UTC (rev 89153)
+++ trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2011-06-17 19:09:51 UTC (rev 89154)
@@ -59,6 +59,7 @@
, m_data(data)
{}
+ 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); }
virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) {}
@@ -69,6 +70,17 @@
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);
+ m_error.setIsCancellation(true);
+ request = ResourceRequest();
+ return;
+ }
+}
+
ResourceHandleInternal::~ResourceHandleInternal()
{
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
