Merge pull request socketio#1031 from secobarbital/master

Fixed global variable leak
takfjt · Sep 15, 2012 · ec07fa8 · ec07fa8
2 parents c3ba8a7 + f5c32c1
commit ec07fa8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/transports/websocket/default.js b/lib/transports/websocket/default.js
@@ -74,7 +74,8 @@ WebSocket.prototype.protocolVersion = 'hixie-76';
  */
 
 WebSocket.prototype.onSocketConnect = function () {
-  var self = this;
+  var self = this
+    , location;
 
   this.socket.setNoDelay(true);
 
@@ -89,11 +90,11 @@ WebSocket.prototype.onSocketConnect = function () {
 
   var origin = this.req.headers['origin']
   , waitingForNonce = false;
-  if(this.manager.settings['match origin protocol']){
+  if (this.manager.settings['match origin protocol']) {
     location = (origin.indexOf('https')>-1 ? 'wss' : 'ws') + '://' + this.req.headers.host + this.req.url;
-  }else if(this.socket.encrypted){
+  } else if (this.socket.encrypted){
     location = 'wss://' + this.req.headers.host + this.req.url;
-  }else{
+  } else {
     location = 'ws://' + this.req.headers.host + this.req.url;
   }