305898 Websocket handles query string in URI

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1851 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -1,3 +1,6 @@
+jetty-7.1.3-SNAPSHOT
+ + 305898 Websocket handles query string in URI
+
 jetty-7.1.2.v20100523
  + 308866 Update test suite to JUnit4 - Module jetty-util
  + 312948 Recycle SSL crypto buffers

jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java

@@ -77,7 +77,6 @@ public class IPAccessHandlerTest
                 }
             });
         _server.setHandler(_handler);
-        Log.getLog().setDebugEnabled(true);
         _server.start();
     }
     

jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java

@@ -93,8 +93,10 @@ public class WebSocketFactory
         WebSocketConnection connection = new WebSocketConnection(websocket,endp,_buffers,http.getTimeStamp(), _maxIdleTime);
 
         String uri=request.getRequestURI();
+	String query=request.getQueryString();
+	if (query!=null && query.length()>0)
+	    uri+="?"+query;
         String host=request.getHeader("Host");
-
         response.setHeader("Upgrade","WebSocket");
         response.addHeader("Connection","Upgrade");
         response.addHeader("WebSocket-Origin",origin);