Restore NSURLRequest's default time interval to match behavior before NSURLSession...

https://bugs.webkit.org/show_bug.cgi?id=165821
<rdar://problem/28492939>

Reviewed by Brady Eidson.

Before adopting NSURLSession, iOS used CFURLConnection, not NSURLConnection.
iOS used to have a default timeout of INT_MAX and it now has a default timeout of 0, which means use the
default NSURLRequest timeout, which is 60 seconds.  This is not enough for some slow mobile networks,
so we want to match behavior of our CFURLConnection code here.

* platform/network/ResourceRequestBase.cpp:
Use INT_MAX as the default timeout of requests on iOS.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 29f3fd7..ed706ae 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2016-12-13  Alex Christensen  <achristensen@webkit.org>
+
+        Restore NSURLRequest's default time interval to match behavior before NSURLSession adoption
+        https://bugs.webkit.org/show_bug.cgi?id=165821
+        <rdar://problem/28492939>
+
+        Reviewed by Brady Eidson.
+
+        Before adopting NSURLSession, iOS used CFURLConnection, not NSURLConnection.
+        iOS used to have a default timeout of INT_MAX and it now has a default timeout of 0, which means use the 
+        default NSURLRequest timeout, which is 60 seconds.  This is not enough for some slow mobile networks,
+        so we want to match behavior of our CFURLConnection code here.
+
+        * platform/network/ResourceRequestBase.cpp:
+        Use INT_MAX as the default timeout of requests on iOS.
+
 2016-12-13  Filip Pizlo  <fpizlo@apple.com>
 
         Make opaque root scanning truly constraint-based

diff --git a/Source/WebCore/platform/network/ResourceRequestBase.cpp b/Source/WebCore/platform/network/ResourceRequestBase.cpp
index c324d8e..e48baca 100644 (file)
--- a/Source/WebCore/platform/network/ResourceRequestBase.cpp
+++ b/Source/WebCore/platform/network/ResourceRequestBase.cpp
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-#if !USE(SOUP) && (!PLATFORM(COCOA) || USE(CFURLCONNECTION))
+#if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFURLCONNECTION))
 double ResourceRequestBase::s_defaultTimeoutInterval = INT_MAX;
 #else
 // Will use NSURLRequest default timeout unless set to a non-zero value with setDefaultTimeoutInterval().