Merge pull request #252 from suenway/master

Patch for inappropriate connection channel when working at proxy mode

Author: Stephane Landelle

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

@@ -179,7 +179,7 @@ private HttpURLConnection createUrlConnection(Request request) throws IOExceptio
             urlConnection =
                     (HttpURLConnection) AsyncHttpProviderUtils.createUri(request.getUrl()).toURL().openConnection(Proxy.NO_PROXY);
         } else {
-            urlConnection = (HttpURLConnection) AsyncHttpProviderUtils.createUri(request.getUrl()).toURL().openConnection(proxy);
+            urlConnection = (HttpURLConnection) AsyncHttpProviderUtils.createUri(proxyServer.toString()).toURL().openConnection(proxy);
         }
 
         if (request.getUrl().startsWith("https")) {

providers/grizzly/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -2549,7 +2549,8 @@ public void updated(Connection result) {
 
         private static String getPoolKey(final Request request) {
             final ConnectionPoolKeyStrategy keyStrategy = request.getConnectionPoolKeyStrategy();
-            return keyStrategy.getKey(request.getURI());
+            String savedUrlInConnPool = request.getProxyServer() != null ? request.getProxyServer().toString() : request.getUrl();
+            return keyStrategy.getKey(AsyncHttpProviderUtils.createUri(AsyncHttpProviderUtils.getBaseUrl(savedUrlInConnPool)));
         }
 
         // ------------------------------------------------------ Nested Classes

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

@@ -1279,7 +1279,8 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth,
     private void drainChannel(final ChannelHandlerContext ctx, final NettyResponseFuture<?> future, final boolean keepAlive, final URI uri) {
         ctx.setAttachment(new AsyncCallable(future) {
             public Object call() throws Exception {
-                if (keepAlive && ctx.getChannel().isReadable() && connectionsPool.offer(future.getConnectionPoolKeyStrategy().getKey(uri), ctx.getChannel())) {
+                URI connUrl = future.getRequest().getProxyServer() == null ? future.getURI() : AsyncHttpProviderUtils.createUri(future.getRequest().getProxyServer().toString());
+                if (keepAlive && ctx.getChannel().isReadable() && connectionsPool.offer(future.getConnectionPoolKeyStrategy().getKey(connUrl), ctx.getChannel())) {
                     return null;
                 }
 
@@ -1476,7 +1477,7 @@ private void finishUpdate(final NettyResponseFuture<?> future, final ChannelHand
             drainChannel(ctx, future, future.getKeepAlive(), future.getURI());
         } else {
             if (future.getKeepAlive() && ctx.getChannel().isReadable() &&
-                    connectionsPool.offer(future.getConnectionPoolKeyStrategy().getKey(future.getURI()), ctx.getChannel())) {
+                    (connectionsPool.offer(AsyncHttpProviderUtils.getBaseUrl(future.getRequest().getProxyServer() == null ? future.getURI() : AsyncHttpProviderUtils.createUri(future.getRequest().getProxyServer().toString())), ctx.getChannel()))){
                 markAsDone(future, ctx);
                 return;
             }