[master] fix issue AsyncHttpClient#608

AsyncHttpClient#608
"Grizzly provider can't deal with wss + proxy"

Author: oleksiys

providers/grizzly/pom.xml

@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <grizzly.version>2.3.14</grizzly.version>
+        <grizzly.version>2.3.16</grizzly.version>
         <grizzly.npn.version>1.1</grizzly.npn.version>
     </properties>
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java

@@ -469,10 +469,13 @@ private static boolean isWSRequest(final UriComponents requestUri) {
 
     private static void convertToUpgradeRequest(final HttpTxContext ctx) {
 
-        UriComponents originalUri = ctx.getRequestUri();
-        String newScheme = originalUri.getScheme().equalsIgnoreCase("https") ? "wss" : "ws";
-        ctx.setWsRequestURI(originalUri);
-        ctx.setRequestUri(originalUri.withNewScheme(newScheme));
+        final UriComponents requestUri = ctx.getRequestUri();
+
+        ctx.setWsRequestURI(requestUri);
+        ctx.setRequestUri(requestUri.withNewScheme(
+                "ws".equals(requestUri.getScheme())
+                        ? "http"
+                        : "https"));
     }
 
     private void addGeneralHeaders(final Request request, final HttpRequestPacket requestPacket) {

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/ProxyFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. 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.
@@ -29,6 +29,7 @@
 import org.glassfish.grizzly.http.util.Header;
 
 import java.io.IOException;
+import org.glassfish.grizzly.http.HttpPacket;
 
 /**
  * This Filter will be placed in the FilterChain when a request is being
@@ -56,15 +57,21 @@ public ProxyFilter(final ProxyServer proxyServer, final AsyncHttpClientConfig co
 
     @Override
     public NextAction handleWrite(FilterChainContext ctx) throws IOException {
-        org.glassfish.grizzly.http.HttpContent content = ctx.getMessage();
-        HttpRequestPacket request = (HttpRequestPacket) content.getHttpHeader();
-        HttpTxContext context = HttpTxContext.get(ctx);
-        assert (context != null);
-        Request req = context.getRequest();
-        if (!secure) {
-            request.setRequestURI(req.getURI().toUrl());
+        final Object msg = ctx.getMessage();
+        if (HttpPacket.isHttp(msg)) {
+            HttpPacket httpPacket = (HttpPacket) msg;
+            final HttpRequestPacket request = (HttpRequestPacket) httpPacket.getHttpHeader();
+            if (!request.isCommitted()) {
+                HttpTxContext context = HttpTxContext.get(ctx);
+                assert (context != null);
+                Request req = context.getRequest();
+                if (!secure) {
+                    request.setRequestURI(req.getURI().toUrl());
+                }
+                addProxyHeaders(getRealm(req), request);
+            }
         }
-        addProxyHeaders(getRealm(req), request);
+        
         return ctx.getInvokeAction();
     }
 

providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/websocket/GrizzlyProxyTunnellingTest.java

@@ -25,9 +25,4 @@ public class GrizzlyProxyTunnellingTest extends ProxyTunnellingTest {
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return GrizzlyProviderUtil.grizzlyProvider(config);
     }
-
-    @Test(timeOut = 60000, enabled = false)
-    public void echoText() throws Exception {
-        // FIXME
-    }
 }