Added connection timeout on per request basis.

Author: neotyk

src/main/java/com/ning/http/client/Request.java

@@ -230,4 +230,5 @@ public static interface EntityWriter {
 
     public boolean isUseRawUrl();
 
+    public int getConnectTimeout();
 }

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -66,6 +66,7 @@ private static final class RequestImpl implements Request {
         private long rangeOffset = 0;
         public String charset;
         private boolean useRawUrl = false;
+        private int connectTimeout = 0;
 
         public RequestImpl(boolean useRawUrl) {
             this.useRawUrl = useRawUrl;
@@ -97,6 +98,7 @@ public RequestImpl(Request prototype) {
                 this.rangeOffset = prototype.getRangeOffset();
                 this.charset = prototype.getBodyEncoding();
                 this.useRawUrl = prototype.isUseRawUrl();
+                this.connectTimeout = prototype.getConnectTimeout();
             }
         }
 
@@ -299,6 +301,10 @@ public String toString() {
         public boolean isUseRawUrl() {
             return useRawUrl;
         }
+
+        public int getConnectTimeout() {
+            return connectTimeout;
+        }
     }
 
     private final Class<T> derived;

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -2291,6 +2291,9 @@ private Connection obtainConnection0(final String url,
             String host = ((proxy != null) ? proxy.getHost() : uri.getHost());
             int port = ((proxy != null) ? proxy.getPort() : uri.getPort());
             int cTimeout = provider.clientConfig.getConnectionTimeoutInMs();
+            if (request.getConnectTimeout() > 0) {
+                cTimeout = request.getConnectTimeout();
+            }
             FutureImpl<Connection> future = Futures.createSafeFuture();
             CompletionHandler<Connection> ch = Futures.toCompletionHandler(future,
                     createConnectionCompletionHandler(request, requestFuture, null));

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -454,7 +454,11 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
             int requestTimeout = (conf != null && conf.getRequestTimeoutInMs() != 0) ?
                     conf.getRequestTimeoutInMs() : config.getRequestTimeoutInMs();
 
-            urlConnection.setConnectTimeout(config.getConnectionTimeoutInMs());
+            int connectTimeout = config.getConnectionTimeoutInMs();
+            if (request.getConnectTimeout() > 0) {
+                connectTimeout = request.getConnectTimeout();
+            }
+            urlConnection.setConnectTimeout(connectTimeout);
 
             if (requestTimeout != -1)
                 urlConnection.setReadTimeout(requestTimeout);

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -947,7 +947,11 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
 
         ChannelFuture channelFuture;
         ClientBootstrap bootstrap = request.getUrl().startsWith(WEBSOCKET) ? webSocketBootstrap : (useSSl ? secureBootstrap : plainBootstrap);
-        bootstrap.setOption("connectTimeoutMillis", config.getConnectionTimeoutInMs());
+        int connectionTimeoutInMs = config.getConnectionTimeoutInMs();
+        if (request.getConnectTimeout() > 0) {
+            connectionTimeoutInMs = request.getConnectTimeout();
+        }
+        bootstrap.setOption("connectTimeoutMillis", connectionTimeoutInMs);
 
         // Do no enable this with win.
         if (System.getProperty("os.name").toLowerCase().indexOf("win") == -1) {
@@ -977,6 +981,9 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
 
         if (directInvokation && !asyncConnect && request.getFile() == null) {
             int timeOut = config.getConnectionTimeoutInMs() > 0 ? config.getConnectionTimeoutInMs() : Integer.MAX_VALUE;
+            if (request.getConnectTimeout() > 0) {
+                timeOut = request.getConnectTimeout();
+            }
             if (!channelFuture.awaitUninterruptibly(timeOut, TimeUnit.MILLISECONDS)) {
                 if (acquiredConnection) {
                     freeConnections.release();