1 files changed, 3 insertions, 1 deletions
diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
index c69136bc00..1b3fc5b3c1 100644
--- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
+++ b/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);