Modified: trunk/Source/WebCore/ChangeLog (210235 => 210236)
--- trunk/Source/WebCore/ChangeLog 2017-01-03 09:08:21 UTC (rev 210235)
+++ trunk/Source/WebCore/ChangeLog 2017-01-03 10:05:52 UTC (rev 210236)
@@ -1,3 +1,17 @@
+2017-01-03 Per Arne Vollan <[email protected]>
+
+ [Win] Some xmlhttprequest tests are failing.
+ https://bugs.webkit.org/show_bug.cgi?id=166638
+
+ Reviewed by Darin Adler.
+
+ The tests are failing because the request timeout is set to zero.
+ When the timeout is set to zero, we should use the default timeout.
+
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+
2017-01-02 Yusuke Suzuki <[email protected]>
Unreviewed, follow-up fix for r210227
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (210235 => 210236)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2017-01-03 09:08:21 UTC (rev 210235)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2017-01-03 10:05:52 UTC (rev 210236)
@@ -139,14 +139,15 @@
RetainPtr<CFURLRef> url = ""
RetainPtr<CFURLRef> firstPartyForCookies = ResourceRequest::firstPartyForCookies().createCFURL();
+ double timeoutInterval = ResourceRequestBase::timeoutInterval() ? ResourceRequestBase::timeoutInterval() : ResourceRequestBase::defaultTimeoutInterval();
if (m_cfRequest) {
cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
CFURLRequestSetURL(cfRequest, url.get());
CFURLRequestSetMainDocumentURL(cfRequest, firstPartyForCookies.get());
CFURLRequestSetCachePolicy(cfRequest, (CFURLRequestCachePolicy)cachePolicy());
- CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval());
+ CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval);
} else
- cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval(), firstPartyForCookies.get());
+ cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval, firstPartyForCookies.get());
CFURLRequestSetHTTPRequestMethod(cfRequest, httpMethod().createCFString().get());
@@ -201,14 +202,15 @@
RetainPtr<CFURLRef> url = ""
RetainPtr<CFURLRef> firstPartyForCookies = ResourceRequest::firstPartyForCookies().createCFURL();
+ double timeoutInterval = ResourceRequestBase::timeoutInterval() ? ResourceRequestBase::timeoutInterval() : ResourceRequestBase::defaultTimeoutInterval();
if (m_cfRequest) {
cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
CFURLRequestSetURL(cfRequest, url.get());
CFURLRequestSetMainDocumentURL(cfRequest, firstPartyForCookies.get());
CFURLRequestSetCachePolicy(cfRequest, toPlatformRequestCachePolicy(cachePolicy()));
- CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval());
+ CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval);
} else
- cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval(), firstPartyForCookies.get());
+ cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval, firstPartyForCookies.get());
FormData* formData = httpBody();
if (formData && !formData->isEmpty())
