Merge branch 'master' into spdy

1 files changed, 5 insertions, 1 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index fbbec80..4d37838 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -333,11 +333,15 @@ public class AsyncHttpServer {
                     response.end();
                     return;
                 }
-                callback.onConnected(new WebSocketImpl(request, response), request.getHeaders());
+                callback.onConnected(createWebSocket(request, response), request.getHeaders());
             }
         });
     }
     
+    protected WebSocket createWebSocket(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
+        return new WebSocketImpl(request, response);
+    }
+    
     public void get(String regex, HttpServerRequestCallback callback) {
         addAction(AsyncHttpGet.METHOD, regex, callback);
     }