Title: [107021] trunk/Source/WebCore
- Revision
- 107021
- Author
- commit-qu...@webkit.org
- Date
- 2012-02-07 18:05:34 -0800 (Tue, 07 Feb 2012)
Log Message
[BlackBerry] NetworkJob should stop redirecting when the request is cleared by client
https://bugs.webkit.org/show_bug.cgi?id=78029
Patch by Yong Li <y...@rim.com> on 2012-02-07
Reviewed by Rob Buis.
When a redirect is rejected by security origin check, the ResourceRequest
will be cleared (see DocumentThreadableLoader::redirectReceived()). In this
case, we should stop handling the request.
No new tests because existing tests (like http:/tests/xmlhttprequest/redirect-cross
-origin-tripmine.html) can cover this.
* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::startNewJobWithRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107020 => 107021)
--- trunk/Source/WebCore/ChangeLog 2012-02-08 01:51:10 UTC (rev 107020)
+++ trunk/Source/WebCore/ChangeLog 2012-02-08 02:05:34 UTC (rev 107021)
@@ -1,3 +1,20 @@
+2012-02-07 Yong Li <y...@rim.com>
+
+ [BlackBerry] NetworkJob should stop redirecting when the request is cleared by client
+ https://bugs.webkit.org/show_bug.cgi?id=78029
+
+ Reviewed by Rob Buis.
+
+ When a redirect is rejected by security origin check, the ResourceRequest
+ will be cleared (see DocumentThreadableLoader::redirectReceived()). In this
+ case, we should stop handling the request.
+
+ No new tests because existing tests (like http:/tests/xmlhttprequest/redirect-cross
+ -origin-tripmine.html) can cover this.
+
+ * platform/network/blackberry/NetworkJob.cpp:
+ (WebCore::NetworkJob::startNewJobWithRequest):
+
2012-02-07 David Barton <dbar...@mathscribe.com>
Remove extraneous MathML code before bug 52444 fix
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (107020 => 107021)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-02-08 01:51:10 UTC (rev 107020)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-02-08 02:05:34 UTC (rev 107021)
@@ -506,7 +506,8 @@
m_handle->client()->willSendRequest(m_handle.get(), newRequest, m_response);
// m_cancelled can become true if the url fails the policy check.
- if (m_cancelled)
+ // newRequest can be cleared when the redirect is rejected.
+ if (m_cancelled || newRequest.isEmpty())
return false;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
