Don't send "Connection: close" on HTTP/1.0, close AsyncHttpClient#910

Author: slandelle

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

@@ -469,8 +469,9 @@ private void configure(Uri uri, HttpURLConnection urlConnection, Request request
                 }
             }
 
-            String ka = AsyncHttpProviderUtils.keepAliveHeaderValue(config);
-            urlConnection.setRequestProperty("Connection", ka);
+            String ka = AsyncHttpProviderUtils.connectionHeader(false, false);
+            if (ka != null)
+                urlConnection.setRequestProperty("Connection", ka);
             ProxyServer proxyServer = ProxyUtils.getProxyServer(config, request);
             boolean avoidProxy = ProxyUtils.avoidProxy(proxyServer, uri.getHost());
             if (!avoidProxy) {

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestFactory.java

@@ -14,6 +14,7 @@
 package com.ning.http.client.providers.netty.request;
 
 import static com.ning.http.client.providers.netty.ws.WebSocketUtils.getKey;
+import static com.ning.http.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
 import static com.ning.http.util.AsyncHttpProviderUtils.*;
 import static com.ning.http.util.AuthenticatorUtils.computeBasicAuthentication;
 import static com.ning.http.util.AuthenticatorUtils.computeDigestAuthentication;
@@ -271,7 +272,9 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
         HttpMethod method = forceConnect ? HttpMethod.CONNECT : HttpMethod.valueOf(request.getMethod());
         boolean connect = method == HttpMethod.CONNECT;
 
-        HttpVersion httpVersion = connect && proxyServer.isForceHttp10() ? HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1;
+        boolean allowConnectionPooling = config.isAllowPoolingConnections() && (!isSecure(uri) || config.isAllowPoolingSslConnections());
+        
+        HttpVersion httpVersion = !allowConnectionPooling || (connect && proxyServer.isForceHttp10()) ? HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1;
         String requestUri = requestUri(uri, proxyServer, connect);
 
         NettyBody body = body(request, connect);
@@ -326,7 +329,9 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
                     .set(HttpHeaders.Names.SEC_WEBSOCKET_VERSION, "13");
 
         } else if (!headers.contains(HttpHeaders.Names.CONNECTION)) {
-            headers.set(HttpHeaders.Names.CONNECTION, keepAliveHeaderValue(config));
+            String connectionHeaderValue = connectionHeader(allowConnectionPooling, httpVersion == HttpVersion.HTTP_1_1);
+            if (connectionHeaderValue != null)
+                headers.set(HttpHeaders.Names.CONNECTION, connectionHeaderValue);
         }
 
         if (!headers.contains(HttpHeaders.Names.HOST))

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

@@ -157,8 +157,13 @@ public static String parseCharset(String contentType) {
         return null;
     }
 
-    public static String keepAliveHeaderValue(AsyncHttpClientConfig config) {
-        return config.isAllowPoolingConnections() ? "keep-alive" : "close";
+    public static String connectionHeader(boolean allowConnectionPooling, boolean http11) {
+        if (allowConnectionPooling)
+            return "keep-alive";
+        else if (http11)
+            return "close";
+        else
+            return null;
     }
 
     public static int requestTimeout(AsyncHttpClientConfig config, Request request) {