Revert "[fix minor] Prevent crashes from attempting to remove listeners more than once when proxying websocket requests."

This reverts commit a681493371ae63f026e869bf58b6fea682dc5de3.
This commit is contained in:
indexzero 2013-03-09 00:43:25 -05:00
parent a681493371
commit c6da760ca9

View File

@ -472,8 +472,6 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
// the appropriate events.
//
function onUpgrade (reverseProxy, proxySocket) {
var detached;
if (!reverseProxy) {
proxySocket.end();
socket.end();
@ -545,15 +543,12 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
// from `reverseProxy` and `proxySocket`.
//
function detach() {
if (!detached) {
detached = true;
proxySocket.destroySoon();
proxySocket.removeListener('end', listeners.onIncomingClose);
proxySocket.removeListener('data', listeners.onIncoming);
reverseProxy.incoming.socket.destroySoon();
reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
}
proxySocket.destroySoon();
proxySocket.removeListener('end', listeners.onIncomingClose);
proxySocket.removeListener('data', listeners.onIncoming);
reverseProxy.incoming.socket.destroySoon();
reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
}
//