Fix connection reuse strategy on HTTP/1.0, close AsyncHttpClient#911

Author: slandelle

providers/netty3/src/main/java/org/asynchttpclient/netty/NettyAsyncHttpProviderConfig.java

@@ -22,7 +22,7 @@
 import org.asynchttpclient.AsyncHttpProviderConfig;
 import org.asynchttpclient.channel.pool.ConnectionStrategy;
 import org.asynchttpclient.netty.channel.pool.ChannelPool;
-import org.asynchttpclient.netty.handler.Http1Point1ConnectionStrategy;
+import org.asynchttpclient.netty.handler.DefaultConnectionStrategy;
 import org.asynchttpclient.netty.ws.NettyWebSocket;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelPipeline;
@@ -121,7 +121,7 @@ public Set<Map.Entry<String, Object>> propertiesSet() {
 
     private NettyWebSocketFactory nettyWebSocketFactory = new DefaultNettyWebSocketFactory();
 
-    private ConnectionStrategy<HttpRequest, HttpResponse> connectionStrategy = new Http1Point1ConnectionStrategy();
+    private ConnectionStrategy<HttpRequest, HttpResponse> connectionStrategy = new DefaultConnectionStrategy();
 
     public boolean isUseDeadLockChecker() {
         return useDeadLockChecker;

providers/netty3/src/main/java/org/asynchttpclient/netty/handler/DefaultConnectionStrategy.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.netty.handler;
+
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.CLOSE;
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.KEEP_ALIVE;
+
+import org.asynchttpclient.channel.pool.ConnectionStrategy;
+import org.jboss.netty.handler.codec.http.HttpMessage;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.handler.codec.http.HttpVersion;
+
+/**
+ * Connection strategy implementing standard HTTP 1.0/1.1 behaviour.
+ */
+public class DefaultConnectionStrategy implements ConnectionStrategy<HttpRequest, HttpResponse> {
+
+    /**
+     * Implemented in accordance with RFC 7230 section 6.1
+     * https://tools.ietf.org/html/rfc7230#section-6.1
+     */
+    @Override
+    public boolean keepAlive(HttpRequest request, HttpResponse response) {
+        
+        String responseConnectionHeader = connectionHeader(response);
+        
+        
+        if (CLOSE.equalsIgnoreCase(responseConnectionHeader)) {
+            return false;
+        } else {
+            String requestConnectionHeader = connectionHeader(request);
+            
+            if (request.getProtocolVersion() == HttpVersion.HTTP_1_0) {
+                // only use keep-alive if both parties agreed upon it
+                return KEEP_ALIVE.equalsIgnoreCase(requestConnectionHeader) && KEEP_ALIVE.equalsIgnoreCase(responseConnectionHeader);
+                
+            } else {
+                // 1.1+, keep-alive is default behavior
+                return !CLOSE.equalsIgnoreCase(requestConnectionHeader);
+            }
+        }
+    }
+
+    private String connectionHeader(HttpMessage message) {
+        return message.headers().get(CONNECTION);
+    }
+}

providers/netty3/src/main/java/org/asynchttpclient/netty/handler/Http1Point1ConnectionStrategy.java

@@ -30,7 +30,7 @@
 import org.asynchttpclient.AsyncHttpProviderConfig;
 import org.asynchttpclient.channel.pool.ConnectionStrategy;
 import org.asynchttpclient.netty.channel.pool.ChannelPool;
-import org.asynchttpclient.netty.handler.Http1Point1ConnectionStrategy;
+import org.asynchttpclient.netty.handler.DefaultConnectionStrategy;
 import org.asynchttpclient.netty.ws.NettyWebSocket;
 
 /**
@@ -147,7 +147,7 @@ public NettyWebSocket newNettyWebSocket(Channel channel, AsyncHttpClientConfig c
 
     private NettyWebSocketFactory nettyWebSocketFactory = new DefaultNettyWebSocketFactory();
 
-    private ConnectionStrategy<HttpRequest, HttpResponse> connectionStrategy = new Http1Point1ConnectionStrategy();
+    private ConnectionStrategy<HttpRequest, HttpResponse> connectionStrategy = new DefaultConnectionStrategy();
 
     public EventLoopGroup getEventLoopGroup() {
         return eventLoopGroup;

providers/netty4/src/main/java/org/asynchttpclient/netty/NettyAsyncHttpProviderConfig.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.netty.handler;
+
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
+import static io.netty.handler.codec.http.HttpHeaders.Values.CLOSE;
+import static io.netty.handler.codec.http.HttpHeaders.Values.KEEP_ALIVE;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpVersion;
+
+import org.asynchttpclient.channel.pool.ConnectionStrategy;
+
+/**
+ * Connection strategy implementing standard HTTP 1.0/1.1 behaviour.
+ */
+public class DefaultConnectionStrategy implements ConnectionStrategy<HttpRequest, HttpResponse> {
+
+    /**
+     * Implemented in accordance with RFC 7230 section 6.1
+     * https://tools.ietf.org/html/rfc7230#section-6.1
+     */
+    @Override
+    public boolean keepAlive(HttpRequest request, HttpResponse response) {
+
+        String responseConnectionHeader = connectionHeader(response);
+
+        if (CLOSE.equalsIgnoreCase(responseConnectionHeader)) {
+            return false;
+        } else {
+            String requestConnectionHeader = connectionHeader(request);
+
+            if (request.getProtocolVersion() == HttpVersion.HTTP_1_0) {
+                // only use keep-alive if both parties agreed upon it
+                return KEEP_ALIVE.equalsIgnoreCase(requestConnectionHeader) && KEEP_ALIVE.equalsIgnoreCase(responseConnectionHeader);
+
+            } else {
+                // 1.1+, keep-alive is default behavior
+                return !CLOSE.equalsIgnoreCase(requestConnectionHeader);
+            }
+        }
+    }
+
+    private String connectionHeader(HttpMessage message) {
+        return message.headers().get(CONNECTION);
+    }
+}