svn commit: r1632224 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/UpgradeUtil.java

[violetagg]

Author: violetagg
Date: Thu Oct 16 07:49:53 2014
New Revision: 1632224

URL: http://svn.apache.org/r1632224
Log:
Merged revision 1631818 from tomcat/trunk:
Use constant strings for header names.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1631818

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1632224&r1=1632223&r2=1632224&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 
Thu Oct 16 07:49:53 2014
@@ -180,10 +180,10 @@ public class UpgradeUtil {
                 getWebSocketAccept(key));
         if (subProtocol != null && subProtocol.length() > 0) {
             // RFC6455 4.2.2 explicitly states "" is not valid here
-            resp.setHeader("Sec-WebSocket-Protocol", subProtocol);
+            resp.setHeader(Constants.WS_PROTOCOL_HEADER_NAME, subProtocol);
         }
         if (!transformations.isEmpty()) {
-            resp.setHeader("Sec-WebSocket-Extensions", 
responseHeaderExtensions.toString());
+            resp.setHeader(Constants.WS_EXTENSIONS_HEADER_NAME, 
responseHeaderExtensions.toString());
         }
 
         WsHandshakeRequest wsRequest = new WsHandshakeRequest(req);



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