svn commit: r1459838 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

[markt]

Author: markt
Date: Fri Mar 22 15:17:51 2013
New Revision: 1459838

URL: http://svn.apache.org/r1459838
Log:
Client needs to send request sub-protocols

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=1459838&r1=1459837&r2=1459838&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri 
Mar 22 15:17:51 2013
@@ -166,7 +166,8 @@ public class WsWebSocketContainer
                     sm.getString("wsWebSocketContainer.pathNoHost"));
         }
         int port = path.getPort();
-        Map<String,List<String>> reqHeaders = createRequestHeaders(host, port);
+        Map<String,List<String>> reqHeaders = createRequestHeaders(host, port,
+                clientEndpointConfiguration.getPreferredSubprotocols());
         clientEndpointConfiguration.getConfigurator().
                 beforeRequest(reqHeaders);
 
@@ -304,7 +305,7 @@ public class WsWebSocketContainer
     }
 
     private Map<String,List<String>> createRequestHeaders(String host,
-            int port) {
+            int port, List<String> subProtocols) {
 
         Map<String,List<String>> headers = new HashMap<>();
 
@@ -338,6 +339,10 @@ public class WsWebSocketContainer
         wsKeyValues.add(generateWsKeyValue());
         headers.put(Constants.WS_KEY_HEADER_NAME, wsKeyValues);
 
+        // WebSocket sub-protocols
+        if (subProtocols != null && subProtocols.size() > 0) {
+            headers.put(Constants.WS_PROTOCOL_HEADER_NAME, subProtocols);
+        }
         return headers;
     }
 



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