New fix for issue Atmosphere#1612

[jsr356] Workaround https://java.net/jira/browse/WEBSOCKET_SPEC-228
mvsmasiero · May 29, 2014 · 68c0d1b · 68c0d1b
1 parent 3536038
commit 68c0d1b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java b/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java
@@ -144,9 +144,15 @@ public void onOpen(Session session, EndpointConfig endpointConfig) {
 
             // https://issues.apache.org/bugzilla/show_bug.cgi?id=56573
             // https://java.net/jira/browse/WEBSOCKET_SPEC-228
-            if (!requestUri.startsWith("ws://")) {
-                String protocol = session.isSecure() ? "wss://" : "ws://";
-                requestUri = new StringBuilder(protocol).append("127.0.0.1:8080").append(requestUri).toString();
+            if ( (!requestUri.startsWith("http://")) || (!requestUri.startsWith("https://")) ) {
+            	if (requestUri.startsWith("/")){
+                	String origin = ((List<String>)handshakeRequest.getHeaders().get("origin")).get(0);
+                	requestUri = new StringBuilder(origin).append(requestUri).toString();
+            	} else if (requestUri.startsWith("ws://")){
+            		requestUri = requestUri.replace("ws://", "http://");
+            	} else if (requestUri.startsWith("wss://")){
+            		requestUri = requestUri.replace("wss://", "https://"); 
+            	}
             }
 
             request = new AtmosphereRequest.Builder()