Title: [209819] trunk/Source/WebCore
- Revision
- 209819
- Author
- [email protected]
- Date
- 2016-12-14 11:53:00 -0800 (Wed, 14 Dec 2016)
Log Message
REGRESSION (r209776): [ios-simulator] LayoutTest http/tests/xmlhttprequest/on-network-timeout-error-during-preflight.html is timing out
https://bugs.webkit.org/show_bug.cgi?id=165836
Reviewed by Brady Eidson.
* loader/CrossOriginAccessControl.cpp:
(WebCore::createAccessControlPreflightRequest):
Use the platform default timeout for CORS preflight requests.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209818 => 209819)
--- trunk/Source/WebCore/ChangeLog 2016-12-14 19:27:14 UTC (rev 209818)
+++ trunk/Source/WebCore/ChangeLog 2016-12-14 19:53:00 UTC (rev 209819)
@@ -1,3 +1,14 @@
+2016-12-14 Alex Christensen <[email protected]>
+
+ REGRESSION (r209776): [ios-simulator] LayoutTest http/tests/xmlhttprequest/on-network-timeout-error-during-preflight.html is timing out
+ https://bugs.webkit.org/show_bug.cgi?id=165836
+
+ Reviewed by Brady Eidson.
+
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::createAccessControlPreflightRequest):
+ Use the platform default timeout for CORS preflight requests.
+
2016-12-14 Antti Koivisto <[email protected]>
WebContent crash under WebCore::CachedResource::load in WebCore::FrameLoader::outgoingReferrer const
Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (209818 => 209819)
--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2016-12-14 19:27:14 UTC (rev 209818)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2016-12-14 19:53:00 UTC (rev 209819)
@@ -87,6 +87,8 @@
ResourceRequest createAccessControlPreflightRequest(const ResourceRequest& request, SecurityOrigin& securityOrigin, const String& referrer)
{
ResourceRequest preflightRequest(request.url());
+ static const double platformDefaultTimeout = 0;
+ preflightRequest.setTimeoutInterval(platformDefaultTimeout);
updateRequestForAccessControl(preflightRequest, securityOrigin, DoNotAllowStoredCredentials);
preflightRequest.setHTTPMethod("OPTIONS");
preflightRequest.setHTTPHeaderField(HTTPHeaderName::AccessControlRequestMethod, request.httpMethod());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
