- Return SPDY support to RUN status.

  + Still need to deal with connection pooling and SPDY connections.

Author: rlubke

providers/grizzly/pom.xml

@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <grizzly.version>2.3.4</grizzly.version>
+        <grizzly.version>2.3.6-SNAPSHOT</grizzly.version>
         <grizzly.npn.version>1.0</grizzly.npn.version>
     </properties>
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/EventHandler.java

@@ -45,7 +45,6 @@
 import org.glassfish.grizzly.websockets.SimpleWebSocket;
 import org.glassfish.grizzly.websockets.WebSocketHolder;
 
-import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
@@ -358,8 +357,6 @@ public void onHttpHeadersParsed(HttpHeader httpHeader,
     @SuppressWarnings("unchecked")
     public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx) {
 
-        boolean result;
-
         Utils.removeRequestInFlight(ctx.getConnection());
 
         if (cleanup != null) {
@@ -373,7 +370,6 @@ public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx)
             return false;
         }
 
-        result = false;
         final HttpResponsePacket response =
                 (HttpResponsePacket) httpHeader;
         final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
@@ -387,7 +383,6 @@ public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx)
                                               context.getRequest(),
                                               context.getHandler(),
                                               context.getFuture());
-                return result;
             } else {
                 cleanup(ctx);
                 final AsyncHandler handler = context.getHandler();
@@ -400,22 +395,25 @@ public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx)
                 } else {
                     context.done();
                 }
-                return result;
             }
+            return false;
         } finally {
-            recycleRequestResponsePackets(response);
+            recycleRequestResponsePackets(ctx.getConnection(), response);
         }
 
     }
 
 
     // ----------------------------------------------------- Private Methods
 
-    private static void recycleRequestResponsePackets(final HttpResponsePacket response) {
-        HttpRequestPacket request = response.getRequest();
-        request.setExpectContent(false);
-        response.recycle();
-        request.recycle();
+    private static void recycleRequestResponsePackets(final Connection c,
+                                                      final HttpResponsePacket response) {
+        if (!Utils.isSpdyConnection(c)) {
+            HttpRequestPacket request = response.getRequest();
+            request.setExpectContent(false);
+            response.recycle();
+            request.recycle();
+        }
     }
 
     private static void processKeepAlive(final Connection c,

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -601,7 +601,7 @@ public String selectProtocol(SSLEngine engine, LinkedHashSet<String> strings) {
                         new SpdySession(connection, false, spdyHandlerFilter);
                 spdySession.setLocalInitialWindowSize(spdyHandlerFilter.getInitialWindowSize());
                 spdySession.setLocalMaxConcurrentStreams(spdyHandlerFilter.getMaxConcurrentStreams());
-
+                Utils.setSpdyConnection(connection);
                 SpdySession.bind(connection, spdySession);
                 return SPDY;
             } else if (strings.contains(HTTP)) {

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/Utils.java

@@ -27,6 +27,8 @@ public final class Utils {
             Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(Utils.class.getName() + "-IGNORE");
     private static final Attribute<AtomicInteger> REQUEST_IN_FLIGHT =
                 Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(Utils.class.getName() + "-IN-FLIGHT");
+    private static final Attribute<Boolean> SPDY =
+            Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(Utils.class.getName() + "-SPDY-CONNECTION");
 
 
     // ------------------------------------------------------------ Constructors
@@ -38,10 +40,6 @@ private Utils() {}
     // ---------------------------------------------------------- Public Methods
 
 
-    public static boolean isSecure(final String uri) {
-        return (uri.startsWith("https:") || uri.startsWith("wss:"));
-    }
-
     public static boolean isSecure(final URI uri) {
         final String scheme = uri.getScheme();
         return ("https".equals(scheme) || "wss".equals(scheme));
@@ -81,4 +79,12 @@ public static int getRequestInFlightCount(final AttributeStorage storage) {
         AtomicInteger counter = REQUEST_IN_FLIGHT.get(storage);
         return ((counter != null) ? counter.get() : 0);
     }
+
+    public static void setSpdyConnection(final Connection c) {
+        SPDY.set(c, Boolean.TRUE);
+    }
+
+    public static boolean isSpdyConnection(final Connection c) {
+        return SPDY.get(c);
+    }
 }

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

@@ -228,7 +228,7 @@ private boolean sendAsGrizzlyRequest(final Request request,
         if (httpCtx.isWSRequest() && !httpCtx.isEstablishingTunnel()) {
             try {
                 final URI wsURI = new URI(httpCtx.getWsRequestURI());
-                httpCtx.setProtocolHandler(Version.DRAFT17.createHandler(true));
+                httpCtx.setProtocolHandler(Version.RFC6455.createHandler(true));
                 httpCtx.setHandshake(
                         httpCtx.getProtocolHandler().createHandShake(wsURI));
                 requestPacket = (HttpRequestPacket)

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/websocket/AHCWebSocketListenerAdapter.java

@@ -19,8 +19,8 @@
 import org.asynchttpclient.websocket.WebSocketPingListener;
 import org.asynchttpclient.websocket.WebSocketPongListener;
 import org.asynchttpclient.websocket.WebSocketTextListener;
+import org.glassfish.grizzly.websockets.ClosingFrame;
 import org.glassfish.grizzly.websockets.DataFrame;
-import org.glassfish.grizzly.websockets.draft06.ClosingFrame;
 
 import java.io.ByteArrayOutputStream;
 

providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlySimpleAsyncHttpClientTest.java

@@ -13,10 +13,18 @@
 
 package org.asynchttpclient.providers.grizzly;
 
+import org.asynchttpclient.AsyncCompletionHandler;
+import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.Request;
+import org.asynchttpclient.RequestBuilder;
+import org.asynchttpclient.Response;
 import org.asynchttpclient.async.SimpleAsyncHttpClientTest;
 
+import java.io.IOException;
+import java.util.concurrent.Future;
+
 public class GrizzlySimpleAsyncHttpClientTest extends SimpleAsyncHttpClientTest {
 
     @Override
@@ -27,4 +35,16 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
     public String getProviderClass() {
         return GrizzlyAsyncHttpProvider.class.getName();
     }
+
+    public static void main(String[] args) {
+        AsyncHttpClientConfig config = new AsyncHttpClientConfig.Builder().setSpdyEnabled(true).build();
+        AsyncHttpClient client = new AsyncHttpClient(new GrizzlyAsyncHttpProvider(config), config);
+        Request request = new RequestBuilder("GET").setUrl("https://www.google.com").build();
+        try {
+            Future<Response> future = client.executeRequest(request);
+            System.out.println(future.get().toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }