circumvents socketio#602 .. although only a horribly malformed websoc…

…ket connection could potentially cause this
mclark4386 · Oct 28, 2011 · 92a3cce · 92a3cce
1 parent 8339c96
commit 92a3cce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/transports/websocket/hybi-07-12.js b/lib/transports/websocket/hybi-07-12.js
@@ -91,7 +91,8 @@ WebSocket.prototype.protocolVersion = '07-12';
 WebSocket.prototype.onSocketConnect = function () {
   var self = this;
 
-  if (this.req.headers.upgrade.toLowerCase() !== 'websocket') {
+  if (typeof this.req.headers.upgrade === 'undefined' || 
+      this.req.headers.upgrade.toLowerCase() !== 'websocket') {
     this.log.warn(this.name + ' connection invalid');
     this.end();
     return;

diff --git a/lib/transports/websocket/hybi-16.js b/lib/transports/websocket/hybi-16.js
@@ -91,7 +91,8 @@ WebSocket.prototype.protocolVersion = '16';
 WebSocket.prototype.onSocketConnect = function () {
   var self = this;
 
-  if (this.req.headers.upgrade.toLowerCase() !== 'websocket') {
+  if (typeof this.req.headers.upgrade === 'undefined' || 
+      this.req.headers.upgrade.toLowerCase() !== 'websocket') {
     this.log.warn(this.name + ' connection invalid');
     this.end();
     return;