Backport partial fix for AsyncHttpClient#254

Author: Stephane Landelle

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

@@ -492,7 +492,7 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
                 }
             }
 
-            String ka = config.getAllowPoolingConnection() ? "keep-alive" : "close";
+            String ka = AsyncHttpProviderUtils.keepAliveHeaderValue(config);
             urlConnection.setRequestProperty("Connection", ka);
             ProxyServer proxyServer = ProxyUtils.getProxyServer(config, request);
             boolean avoidProxy = ProxyUtils.avoidProxy(proxyServer, uri.getHost());

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

@@ -739,12 +739,12 @@ else if (uri.getRawQuery() != null)
         }
 
         if (!webSocket && !request.getHeaders().containsKey(HttpHeaders.Names.CONNECTION)) {
-            nettyRequest.setHeader(HttpHeaders.Names.CONNECTION, "keep-alive");
+            nettyRequest.setHeader(HttpHeaders.Names.CONNECTION, AsyncHttpProviderUtils.keepAliveHeaderValue(config));
         }
 
         if (proxyServer != null) {
             if (!request.getHeaders().containsKey("Proxy-Connection")) {
-                nettyRequest.setHeader("Proxy-Connection", "keep-alive");
+                nettyRequest.setHeader("Proxy-Connection", AsyncHttpProviderUtils.keepAliveHeaderValue(config));
             }
 
             if (proxyServer.getPrincipal() != null) {

src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -12,6 +12,19 @@
  */
 package com.ning.http.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+
+import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.AsyncHttpProvider;
 import com.ning.http.client.ByteArrayPart;
 import com.ning.http.client.Cookie;
@@ -25,18 +38,6 @@
 import com.ning.http.multipart.MultipartRequestEntity;
 import com.ning.http.multipart.PartSource;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-
 /**
  * {@link com.ning.http.client.AsyncHttpProvider} common utilities.
  * <p/>
@@ -550,4 +551,8 @@ public static void checkBodyParts(int statusCode, Collection<HttpResponseBodyPar
             throw new IllegalStateException(BODY_NOT_COMPUTED);
         }
     }
+
+    public static String keepAliveHeaderValue(AsyncHttpClientConfig config) {
+        return config.getAllowPoolingConnection() ? "keep-alive" : "close";
+    }
 }