You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/07 23:54:07 UTC
svn commit: r1370556 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/websocket/WebSocketServlet.java
webapps/docs/changelog.xml
Author: markt
Date: Tue Aug 7 21:54:06 2012
New Revision: 1370556
URL: http://svn.apache.org/viewvc?rev=1370556&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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1370553
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1370556&r1=1370555&r2=1370556&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Tue Aug 7 21:54:06 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);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1370556&r1=1370555&r2=1370556&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 7 21:54:06 2012
@@ -95,6 +95,10 @@
when logging in when session IDs are being encoded as path parameters.
(markt)
</fix>
+ <fix>
+ <bug>53641</bug>: Correct name of HTTP header used in WebSocket
+ handshake for listing the preferred protocols. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org