Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions lib/socket.io/listener.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,47 @@ Listener = module.exports = function(server, options){
this.server.removeAllListeners('request');

this.server.addListener('request', function(req, res){
req.addListener("error",function(err){
console.log("Socket.io::request req error: " + JSON.stringify(err));
req.end && req.end() || req.destroy && req.destroy();
});
res.addListener("error",function(err){
console.log("Socket.io::request res error: " + JSON.stringify(err));
res.end && res.end() || res.destroy && res.destroy();
});
req.socket.addListener("error",function(err){
console.log("Socket.io::request req.socket error: " + JSON.stringify(err));
req.socket && ( req.socket.end && req.socket.end() || req.socket.destroy && req.socket.destroy() );
});
if (self.check(req, res)) return;
for (var i = 0, len = listeners.length; i < len; i++){
listeners[i].call(this, req, res);
}
});

this.server.addListener('upgrade', function(req, socket, head){
req.addListener("error",function(err){
console.log("Socket.io::upgrade req error: " + JSON.stringify(err));
req.end && req.end() || req.destroy && req.destroy();
});
socket.addListener("error",function(err){
console.log("Socket.io::upgrade socket error: " + JSON.stringify(err));
socket.end && socket.end() || socket.destroy && socket.destroy();
});
req.socket.addListener("error",function(err){
console.log("Socket.io::upgrade req.socket error: " + JSON.stringify(err));
req.socket && ( req.socket.end && req.socket.end() || req.socket.destroy && req.socket.destroy() );
});

if (!self.check(req, socket, true, head)){
socket.destroy();
}
});

this.server.addListener('error', function(err){
console.log("Socket.io::server global error: " + JSON.stringify(err));
});

for (var i in transports){
if ('init' in transports[i]) transports[i].init(this);
}
Expand Down
6 changes: 6 additions & 0 deletions lib/socket.io/transports/flashsocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ Flashsocket.init = function(listener){

try {
netserver = net.createServer(function(socket){
socket.addListener("error",function(err){
console.log("Socket.io::netserver request error: " + JSON.stringify(err)); socket.end && socket.end() || socket.destroy && socket.destroy();
});
socket.write('<?xml version="1.0"?>\n');
socket.write('<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">\n');
socket.write('<cross-domain-policy>\n');
Expand All @@ -36,6 +39,9 @@ try {
socket.write('</cross-domain-policy>\n');
socket.end();
});
netserver.addListener("error",function(err){
console.log("Socket.io::netserver global error: " + JSON.stringify(err));
});
netserver.listen(843);
} catch(e){
if (e.errno == 13){
Expand Down
4 changes: 3 additions & 1 deletion lib/socket.io/transports/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ WebSocket.prototype._proveReception = function(headers){
spaces = k.replace(/[^ ]/g, '').length;

if (spaces === 0 || n % spaces !== 0){
this.listener.options.log('Invalid WebSocket key: "' + k + '". Dropping connection');
if(this.listener && this.listener.options){
this.listener.options.log('Invalid WebSocket key: "' + k + '". Dropping connection');
}
this.connection.writeHead(500);
this.connection.end();
return false;
Expand Down