Reuse channel when possible on redirect, close AsyncHttpClient#796

Author: Stephane Landelle

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/handler/Protocol.java

@@ -47,10 +47,8 @@
 import org.asynchttpclient.filter.FilterContext;
 import org.asynchttpclient.filter.FilterException;
 import org.asynchttpclient.filter.ResponseFilter;
-import org.asynchttpclient.providers.netty3.Callback;
 import org.asynchttpclient.providers.netty3.NettyAsyncHttpProviderConfig;
 import org.asynchttpclient.providers.netty3.channel.ChannelManager;
-import org.asynchttpclient.providers.netty3.channel.Channels;
 import org.asynchttpclient.providers.netty3.future.NettyResponseFuture;
 import org.asynchttpclient.providers.netty3.request.NettyRequestSender;
 import org.asynchttpclient.uri.Uri;
@@ -171,22 +169,28 @@ protected boolean exitAfterHandlingRedirect(//
 
                     requestBuilder.setHeaders(propagatedHeaders(future.getRequest()));
 
-                    Callback callback = channelManager.newDrainCallback(future, channel, initialConnectionKeepAlive, initialPoolKey);
+                    final Request nextRequest = requestBuilder.setUrl(newUrl).build();
+
+                    logger.debug("Sending redirect to {}", request.getUri());
+
+                    if (future.isKeepAlive() && !HttpHeaders.isTransferEncodingChunked(response) && !response.isChunked()) {
+                        
+                        boolean redirectToSameHost = request.getUri().getScheme().equals(nextRequest.getUri().getScheme())
+                                && request.getUri().getHost().equals(nextRequest.getUri().getHost())
+                                && request.getUri().getPort() == nextRequest.getUri().getPort();
+
+                        if (redirectToSameHost) {
+                            future.setReuseChannel(true);
+                        } else {
+                            channelManager.drainChannelAndOffer(channel, future, initialConnectionKeepAlive, initialPoolKey);
+                        }
 
-                    if (HttpHeaders.isTransferEncodingChunked(response)) {
-                        // We must make sure there is no bytes left before
-                        // executing the next request.
-                        // FIXME investigate this
-                        Channels.setAttribute(channel, callback);
                     } else {
-                        // FIXME don't understand: this offers the connection to the pool, or even closes it, while the
-                        // request has not been sent, right?
-                        callback.call();
+                        // redirect + chunking = WAT
+                        channelManager.closeChannel(channel);
                     }
 
-                    Request redirectRequest = requestBuilder.setUrl(newUrl).build();
-                    // FIXME why not reuse the channel is same host?
-                    requestSender.sendNextRequest(redirectRequest, future);
+                    requestSender.sendNextRequest(nextRequest, future);
                     return true;
                 }
             }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Protocol.java

@@ -171,22 +171,31 @@ protected boolean exitAfterHandlingRedirect(//
 
                     requestBuilder.setHeaders(propagatedHeaders(future.getRequest()));
 
-                    Callback callback = channelManager.newDrainCallback(future, channel, initialConnectionKeepAlive, initialPoolKey);
+                    final Request nextRequest = requestBuilder.setUrl(newUrl).build();
+
+                    logger.debug("Sending redirect to {}", request.getUri());
+
+                    if (future.isKeepAlive() && !HttpHeaders.isTransferEncodingChunked(response)) {
+                        
+                        boolean redirectToSameHost = request.getUri().getScheme().equals(nextRequest.getUri().getScheme())
+                                && request.getUri().getHost().equals(nextRequest.getUri().getHost())
+                                && request.getUri().getPort() == nextRequest.getUri().getPort();
+
+                        if (redirectToSameHost) {
+                            future.setReuseChannel(true);
+                            requestSender.drainChannelAndExecuteNextRequest(channel, future, nextRequest);
+
+                        } else {
+                            channelManager.drainChannelAndOffer(channel, future, initialConnectionKeepAlive, initialPoolKey);
+                            requestSender.sendNextRequest(nextRequest, future);
+                        }
 
-                    if (HttpHeaders.isTransferEncodingChunked(response)) {
-                        // We must make sure there is no bytes left before
-                        // executing the next request.
-                        // FIXME investigate this
-                        Channels.setAttribute(channel, callback);
                     } else {
-                        // FIXME don't understand: this offers the connection to the pool, or even closes it, while the
-                        // request has not been sent, right?
-                        callback.call();
+                        // redirect + chunking = WAT
+                        channelManager.closeChannel(channel);
+                        requestSender.sendNextRequest(nextRequest, future);
                     }
-
-                    Request redirectRequest = requestBuilder.setUrl(newUrl).build();
-                    // FIXME why not reuse the channel is same host?
-                    requestSender.sendNextRequest(redirectRequest, future);
+                    
                     return true;
                 }
             }