Grizzly side of fix for #102.

Author: rlubke

src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -221,9 +221,12 @@ public final static URI getRedirectUri(URI uri, String location) {
 
         String scheme = newUri.getScheme();
 
-        if (scheme == null || !scheme.equalsIgnoreCase("http") && !scheme.equalsIgnoreCase("https")) {
+        if (scheme == null || !scheme.equalsIgnoreCase("http")
+                && !scheme.equalsIgnoreCase("https")
+                && !scheme.equals("ws")
+                && !scheme.equals("wss")) {
             throw new IllegalArgumentException("The URI scheme, of the URI " + newUri
-                    + ", must be equal (ignoring case) to 'http' or 'https'");
+                    + ", must be equal (ignoring case) to 'ws, 'wss', 'http', or 'https'");
         }
 
         return newUri;

src/test/java/com/ning/http/client/websocket/RedirectTest.java

@@ -20,6 +20,7 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -48,20 +49,26 @@ public void setUpGlobal() throws Exception {
         _connector.setPort(port1);
 
         addConnector(_connector);
-        WebSocketHandler _wsHandler = getWebSocketHandler();
 
-        setHandler(_wsHandler);
+
+
 
         port2 = findFreePort();
         final SelectChannelConnector connector2 = new SelectChannelConnector();
         connector2.setPort(port2);
         addConnector(connector2);
-        setHandler(new AbstractHandler() {
-            @Override
-            public void handle(String s, Request request, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException, ServletException {
-                httpServletResponse.sendRedirect(getTargetUrl());
-            }
-        });
+        WebSocketHandler _wsHandler = getWebSocketHandler();
+        HandlerList list = new HandlerList();
+        list.addHandler(new AbstractHandler() {
+                    @Override
+                    public void handle(String s, Request request, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException, ServletException {
+                        if (request.getLocalPort() == port2) {
+                            httpServletResponse.sendRedirect(getTargetUrl());
+                        }
+                    }
+                });
+        list.addHandler(_wsHandler);
+        setHandler(list);
 
         start();
         log.info("Local HTTP server started successfully");
@@ -81,11 +88,11 @@ public org.eclipse.jetty.websocket.WebSocket doWebSocketConnect(HttpServletReque
 
     @Test(timeOut = 60000)
     public void testRedirectToWSResource() throws Exception {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setFollowRedirects(true).build());
         final CountDownLatch latch = new CountDownLatch(1);
         final AtomicReference<String> text = new AtomicReference<String>("");
 
-        WebSocket websocket = c.prepareGet(getTargetUrl())
+        WebSocket websocket = c.prepareGet(getRedirectURL())
                 .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
 
                     @Override