2014-11-28 23:33 GMT+03:00 <r...@apache.org>: > Author: remm > Date: Fri Nov 28 20:33:20 2014 > New Revision: 1642360 > > URL: http://svn.apache.org/r1642360 > Log: > - Use the extensions specified by the configuration (and ignore if there are > no associated transformations). > - Add an origin header on the client. > - Add path params as params too. > - Use the case insensitive map for all headers. > > Modified: > tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java > tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties > tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java > tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java > tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java > > tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.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=1642360&r1=1642359&r2=1642360&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java > (original) > +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java > Fri Nov 28 20:33:20 2014 > @@ -218,7 +218,7 @@ 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(path, > host, port, > clientEndpointConfiguration.getPreferredSubprotocols(), > clientEndpointConfiguration.getExtensions()); > clientEndpointConfiguration.getConfigurator(). > @@ -430,7 +430,7 @@ public class WsWebSocketContainer > return result; > } > > - private Map<String,List<String>> createRequestHeaders(String host, > + private Map<String,List<String>> createRequestHeaders(URI path, String > host, > int port, List<String> subProtocols, List<Extension> extensions) > { > > Map<String,List<String>> headers = new HashMap<>(); > @@ -476,6 +476,11 @@ public class WsWebSocketContainer > generateExtensionHeaders(extensions)); > } > > + // Origin header > + List<String> originValues = new ArrayList<>(1); > + originValues.add(path.toString()); > + headers.put(Constants.ORIGIN_HEADER_NAME, originValues); > + > return headers; > } > > @@ -571,7 +576,7 @@ public class WsWebSocketContainer > ExecutionException, DeploymentException, EOFException, > TimeoutException { > > - Map<String,List<String>> headers = new HashMap<>(); > + Map<String,List<String>> headers = new CaseInsensitiveKeyMap<>(); > > boolean readStatus = false; > boolean readHeaders = false; > @@ -606,7 +611,7 @@ public class WsWebSocketContainer > } > } > } > - > +System.out.println("Headers: " + headers); The above line does not belong here... > return new WsHandshakeResponse(headers); > } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
