Author: markt
Date: Sun Mar 17 20:31:58 2013
New Revision: 1457554

URL: http://svn.apache.org/r1457554
Log:
Need to pass query string to server too.
Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1457554&r1=1457553&r2=1457554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Sun 
Mar 17 20:31:58 2013
@@ -170,7 +170,7 @@ public class WsWebSocketContainer
         clientEndpointConfiguration.getConfigurator().
                 beforeRequest(reqHeaders);
 
-        ByteBuffer request = createRequest(path.getRawPath(), reqHeaders);
+        ByteBuffer request = createRequest(path, reqHeaders);
 
         SocketAddress sa;
         if (port == -1) {
@@ -343,13 +343,18 @@ public class WsWebSocketContainer
     }
 
 
-    private ByteBuffer createRequest(String rawPath,
+    private ByteBuffer createRequest(URI uri,
             Map<String,List<String>> reqHeaders) {
         ByteBuffer result = ByteBuffer.allocate(4 * 1024);
 
         // Request line
         result.put("GET ".getBytes(iso88591));
-        result.put(rawPath.getBytes(iso88591));
+        result.put(uri.getRawPath().getBytes(iso88591));
+        String query = uri.getRawQuery();
+        if (query != null) {
+            result.put((byte) '?');
+            result.put(query.getBytes(iso88591));
+        }
         result.put(" HTTP/1.1\r\n".getBytes(iso88591));
 
         // Headers



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to