Merge branch 'master' of github.com:LearnBoost/socket.io

dreamfrog · Apr 17, 2012 · 0242a2d · 0242a2d
2 parents dbe6d5f + 9bbf17f
commit 0242a2d
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/transports/websocket/hybi-16.js b/lib/transports/websocket/hybi-16.js
@@ -1,4 +1,3 @@
-
 /*!
  * socket.io-node
  * Copyright(c) 2011 LearnBoost <[email protected]>
@@ -98,7 +97,7 @@ WebSocket.prototype.onSocketConnect = function () {
     return;
   }
 
-  var origin = this.req.headers['origin']
+  var origin = this.req.headers['origin'] || ''
     , location = ((this.manager.settings['match origin protocol'] ?
                       origin.match(/^https/) : this.socket.encrypted) ?
                         'wss' : 'ws')