Author: remy.maucherat(a)jboss.com
Date: 2014-01-29 06:44:13 -0500 (Wed, 29 Jan 2014)
New Revision: 2358
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Log:
Port patch: filter out empty subprotocol.
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2014-01-28
17:06:08 UTC (rev 2357)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2014-01-29
11:44:13 UTC (rev 2358)
@@ -132,7 +132,8 @@
Constants.CONNECTION_HEADER_VALUE);
resp.setHeader(HandshakeResponse.SEC_WEBSOCKET_ACCEPT,
getWebSocketAccept(key));
- if (subProtocol != null) {
+ if (subProtocol != null && subProtocol.length() > 0) {
+ // RFC6455 4.2.2 explicitly states "" is not valid here
resp.setHeader("Sec-WebSocket-Protocol", subProtocol);
}
if (!extensions.isEmpty()) {
Show replies by date