svn commit: r1370553 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java

[markt]

Author: markt
Date: Tue Aug  7 21:51:30 2012
New Revision: 1370553

URL: http://svn.apache.org/viewvc?rev=1370553&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53641
Correct name of HTTP header used in WebSocket handshake for listing the 
preferred protocols

Modified:
    tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1370553&r1=1370552&r2=1370553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Tue 
Aug  7 21:51:30 2012
@@ -94,7 +94,7 @@ public abstract class WebSocketServlet e
         }
 
         List<String> subProtocols = getTokensFromHeader(req,
-                "Sec-WebSocket-Protocol-Client");
+                "Sec-WebSocket-Protocol");
         if (!subProtocols.isEmpty()) {
             subProtocol = selectSubProtocol(subProtocols);
 



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