Author: remm
Date: Fri Dec 5 19:37:38 2014
New Revision: 1643410
URL: http://svn.apache.org/r1643410
Log:
Only keep the origin header value system property, set to null by default (no
origin header).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1643410&r1=1643409&r2=1643410&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Fri Dec 5
19:37:38 2014
@@ -62,12 +62,8 @@ public class Constants {
"Sec-WebSocket-Extensions";
// Configuration for Origin header in client
- static final boolean ALWAYS_ADD_ORIGIN_HEADER =
-
Boolean.getBoolean("org.apache.tomcat.websocket.ALWAYS_ADD_ORIGIN_HEADER");
- static final boolean SET_TARGET_AS_ORIGIN_HEADER =
-
Boolean.getBoolean("org.apache.tomcat.websocket.SET_TARGET_AS_ORIGIN_HEADER");
static final String DEFAULT_ORIGIN_HEADER_VALUE =
-
System.getProperty("org.apache.tomcat.websocket.DEFAULT_ORIGIN_HEADER_VALUE",
"null");
+
System.getProperty("org.apache.tomcat.websocket.DEFAULT_ORIGIN_HEADER_VALUE");
// Configuration for background processing checks intervals
static final int DEFAULT_PROCESS_PERIOD =
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=1643410&r1=1643409&r2=1643410&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri
Dec 5 19:37:38 2014
@@ -243,19 +243,10 @@ public class WsWebSocketContainer
}
// Origin header
- if (Constants.ALWAYS_ADD_ORIGIN_HEADER &&
+ if (Constants.DEFAULT_ORIGIN_HEADER_VALUE != null &&
!reqHeaders.containsKey(Constants.ORIGIN_HEADER_NAME)) {
List<String> originValues = new ArrayList<>(1);
- if (Constants.SET_TARGET_AS_ORIGIN_HEADER) {
- StringBuilder originValue = new StringBuilder();
- originValue.append(path.getHost());
- if (port != -1) {
- originValue.append(':').append(port);
- }
- originValues.add(originValue.toString());
- } else {
- originValues.add(Constants.DEFAULT_ORIGIN_HEADER_VALUE);
- }
+ originValues.add(Constants.DEFAULT_ORIGIN_HEADER_VALUE);
reqHeaders.put(Constants.ORIGIN_HEADER_NAME, originValues);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
