commit f467a39bd94c37a060fb8f9f6628b31c5c0a4c35
author Neil Fuller <nfuller@google.com> Wed Jul 01 10:59:01 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 01 10:59:02 2015 +0000
tree 4195df974336b4d025ba9c438cd6a598e683a982
parent 54ee8648c06474ce612325e28bc0022b58925e1d
parent f4a606d2680805b15b1908c0fbb3ef0a0f90bac1

Merge "Explicitly set Http(s)URLConnection timeouts"

android/main/java/com/squareup/okhttp/HttpHandler.java

diff --git a/android/main/java/com/squareup/okhttp/HttpHandler.java b/android/main/java/com/squareup/okhttp/HttpHandler.java
index f7518ad..22a0b15 100644
--- a/android/main/java/com/squareup/okhttp/HttpHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpHandler.java
@@ -26,6 +26,7 @@
 import java.net.URLStreamHandler;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 public class HttpHandler extends URLStreamHandler {
 
@@ -67,6 +68,11 @@
     public static OkUrlFactory createHttpOkUrlFactory(Proxy proxy) {
         OkHttpClient client = new OkHttpClient();
 
+        // Explicitly set the timeouts to infinity.
+        client.setConnectTimeout(0, TimeUnit.MILLISECONDS);
+        client.setReadTimeout(0, TimeUnit.MILLISECONDS);
+        client.setWriteTimeout(0, TimeUnit.MILLISECONDS);
+
         // Do not permit http -> https and https -> http redirects.
         client.setFollowSslRedirects(false);