Cancel timeouts asap, close AsyncHttpClient#848

Author: slandelle

src/main/java/com/ning/http/client/providers/netty/future/NettyResponseFuture.java

@@ -200,6 +200,8 @@ private V getContent() throws ExecutionException {
 
     private boolean terminateAndExit() {
         cancelTimeouts();
+        this.channel = null;
+        this.reuseChannel = false;
         return isDone.getAndSet(true) || isCancelled.get();
     }
 
@@ -389,11 +391,6 @@ public void attachChannel(Channel channel, boolean reuseChannel) {
         this.reuseChannel = reuseChannel;
     }
 
-    public void detachChannel() {
-        this.channel = null;
-        this.reuseChannel = false;
-    }
-
     public Channel channel() {
         return channel;
     }

src/main/java/com/ning/http/client/providers/netty/handler/HttpProtocol.java

@@ -181,7 +181,8 @@ private void addType3NTLMAuthorizationHeader(String auth, FluentCaseInsensitiveS
 
     private void finishUpdate(final NettyResponseFuture<?> future, Channel channel, boolean expectOtherChunks) throws IOException {
 
-        future.detachChannel();
+        // cancel timeouts asap so they don't trigger while draining the channel or offering to the pool
+        future.cancelTimeouts();
 
         boolean keepAlive = future.isKeepAlive();
         if (expectOtherChunks && keepAlive)