Adding configuration variable matchOriginProtocol

matchOriginProtocol is meant to be used when running socket.io behind a
proxy. matchOriginProtocol should be set to true when you want the
location handshake to match the protocol of the origin. This fixes
issues with terminating the SSL in front of Node and forcing location
to think it's wss instead of ws.

lib/manager.js

@@ -85,6 +85,7 @@ function Manager (server, options) {
     , 'browser client gzip': false
     , 'browser client handler': false
     , 'client store expiration': 15
+    , matchOriginProtocol: false
   };
 
   for (var i in options) {

lib/transports/websocket/default.js

@@ -1,3 +1,4 @@
+
 /*!
  * socket.io-node
  * Copyright(c) 2011 LearnBoost <[email protected]>
@@ -88,7 +89,9 @@ WebSocket.prototype.onSocketConnect = function () {
   }
 
   var origin = this.req.headers.origin
-    , location = (origin.match(/^https/) ? 'wss' : 'ws')
+    , location = ((this.manager.settings.matchOriginProtocol ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url
     , waitingForNonce = false;
 

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.matchOriginProtocol ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url;
 
   if (!this.verifyOrigin(origin)) {

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.matchOriginProtocol ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url;
 
   if (!this.verifyOrigin(origin)) {