Skip to content

Commit

Permalink
Revert "[fix minor] Prevent crashes from attempting to remove listene…
Browse files Browse the repository at this point in the history
…rs more than once when proxying websocket requests."

This reverts commit a681493.
  • Loading branch information
indexzero committed Mar 9, 2013
1 parent a681493 commit c6da760
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions lib/node-http-proxy/http-proxy.js
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}

//
Expand Down

0 comments on commit c6da760

Please sign in to comment.