From c6da760ca9f375025229fe3fc174aca943362f38 Mon Sep 17 00:00:00 2001 From: indexzero Date: Sat, 9 Mar 2013 00:43:25 -0500 Subject: [PATCH] Revert "[fix minor] Prevent crashes from attempting to remove listeners more than once when proxying websocket requests." This reverts commit a681493371ae63f026e869bf58b6fea682dc5de3. --- lib/node-http-proxy/http-proxy.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/node-http-proxy/http-proxy.js b/lib/node-http-proxy/http-proxy.js index cdc5b66..ffc2c9d 100644 --- a/lib/node-http-proxy/http-proxy.js +++ b/lib/node-http-proxy/http-proxy.js @@ -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); } //