From fac2498f1f30b5949babd4c4d28cff88abed1d27 Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Fri, 17 Sep 2010 13:50:06 -0700 Subject: [PATCH 1/3] The listen method doesn't return a netserver instance, so the server onclose netserver.close will fail because netserver will be undefined. --- lib/socket.io/transports/flashsocket.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/socket.io/transports/flashsocket.js b/lib/socket.io/transports/flashsocket.js index bfcf77d39f..fc94ef0112 100644 --- a/lib/socket.io/transports/flashsocket.js +++ b/lib/socket.io/transports/flashsocket.js @@ -35,7 +35,8 @@ try { socket.write('\n'); socket.end(); - }).listen(843); + }); + netserver.listen(843); } catch(e){ if (e.errno == 13){ console.error("\x1B[1;31m" + [ From a3879822896c0e4cd0261f66b277a942f3680b49 Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Fri, 17 Sep 2010 13:51:25 -0700 Subject: [PATCH 2/3] When an error occurs during the connection we should disconnect --- lib/socket.io/transports/websocket.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/socket.io/transports/websocket.js b/lib/socket.io/transports/websocket.js index cd52142841..a73ae73bbb 100644 --- a/lib/socket.io/transports/websocket.js +++ b/lib/socket.io/transports/websocket.js @@ -78,6 +78,10 @@ WebSocket.prototype._onConnect = function(req, socket){ self._handle(data); }); + this.connection.addListener('error', function(data){ + self._onDisconnect(data); + }); + if (this._proveReception(headers)) this._payload(); }; From c6b176555eca6e52920f86889ef697f3ee5ebfbc Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Fri, 17 Sep 2010 14:52:57 -0700 Subject: [PATCH 3/3] Every require is blocking and requiring the sys module over and over and over again just makes no sense + it hurt performance.. Not to mention.. that it's already included. --- lib/socket.io/listener.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/socket.io/listener.js b/lib/socket.io/listener.js index 186156d22b..0e0d52b88c 100644 --- a/lib/socket.io/listener.js +++ b/lib/socket.io/listener.js @@ -34,7 +34,7 @@ Listener = module.exports = function(server, options){ } }, log: function(message){ - require('sys').log(message); + sys.log(message); } }, options);