Merge pull request socketio#622 from mattrobenolt/master

Location mismatch in Safari behind proxy
hugdubois · Dec 5, 2011 · cc2270b · cc2270b
2 parents 94d513c + 36fc7b0
commit cc2270b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/lib/manager.js b/lib/manager.js
@@ -87,6 +87,7 @@ function Manager (server, options) {
     , 'browser client gzip': false
     , 'browser client handler': false
     , 'client store expiration': 15
+    , 'match origin protocol': false
   };
 
   for (var i in options) {

diff --git a/lib/transports/websocket/default.js b/lib/transports/websocket/default.js
@@ -88,8 +88,10 @@ WebSocket.prototype.onSocketConnect = function () {
     return;
   }
 
-  var origin = this.req.headers.origin
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+  var origin = this.req.headers['origin']
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url
     , waitingForNonce = false;
 

diff --git a/lib/transports/websocket/hybi-07-12.js b/lib/transports/websocket/hybi-07-12.js
@@ -99,7 +99,9 @@ WebSocket.prototype.onSocketConnect = function () {
   }
 
   var origin = this.req.headers['sec-websocket-origin']
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url;
 
   if (!this.verifyOrigin(origin)) {

diff --git a/lib/transports/websocket/hybi-16.js b/lib/transports/websocket/hybi-16.js
@@ -99,7 +99,9 @@ WebSocket.prototype.onSocketConnect = function () {
   }
 
   var origin = this.req.headers['origin']
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url;
 
   if (!this.verifyOrigin(origin)) {