Merge pull request #2 from jocull/master

Jarrod Ribble · Jarrod Ribble · commit 76da9a8445c8 · 2012-06-08T09:43:46.000-07:00
Correction for strict locations (rejections on iOS / Safari)
diff --git a/src/main/java/com/netiq/websockify/WebsockifyProxyHandler.java b/src/main/java/com/netiq/websockify/WebsockifyProxyHandler.java
@@ -473,7 +473,12 @@ private void setContentTypeHeader(HttpResponse response, File file) {
     }
 
     private String getWebSocketLocation(HttpRequest req) {
-        return "wss://" + req.getHeader(HttpHeaders.Names.HOST);
+        String prefix = "ws";
+        String origin = req.getHeader(HttpHeaders.Names.ORIGIN).toLowerCase();
+        if(origin.contains("https")){
+            prefix = "wss";
+        }
+        return prefix + "://" + req.getHeader(HttpHeaders.Names.HOST) + req.getUri();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,12 @@ private void setContentTypeHeader(HttpResponse response, File file) {`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`private String getWebSocketLocation(HttpRequest req) {`
`476`		`- return "wss://" + req.getHeader(HttpHeaders.Names.HOST);`
	`476`	`+ String prefix = "ws";`
	`477`	`+ String origin = req.getHeader(HttpHeaders.Names.ORIGIN).toLowerCase();`
	`478`	`+ if(origin.contains("https")){`
	`479`	`+ prefix = "wss";`
	`480`	`+ }`
	`481`	`+ return prefix + "://" + req.getHeader(HttpHeaders.Names.HOST) + req.getUri();`
`477`	`482`	`}`
`478`	`483`
`479`	`484`	`@Override`