Skip to content

Commit c6da760

Browse files
committed
Revert "[fix minor] Prevent crashes from attempting to remove listeners more than once when proxying websocket requests."
This reverts commit a681493.
1 parent a681493 commit c6da760

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

lib/node-http-proxy/http-proxy.js

+6-11
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,6 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
472472
// the appropriate events.
473473
//
474474
function onUpgrade (reverseProxy, proxySocket) {
475-
var detached;
476-
477475
if (!reverseProxy) {
478476
proxySocket.end();
479477
socket.end();
@@ -545,15 +543,12 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
545543
// from `reverseProxy` and `proxySocket`.
546544
//
547545
function detach() {
548-
if (!detached) {
549-
detached = true;
550-
proxySocket.destroySoon();
551-
proxySocket.removeListener('end', listeners.onIncomingClose);
552-
proxySocket.removeListener('data', listeners.onIncoming);
553-
reverseProxy.incoming.socket.destroySoon();
554-
reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
555-
reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
556-
}
546+
proxySocket.destroySoon();
547+
proxySocket.removeListener('end', listeners.onIncomingClose);
548+
proxySocket.removeListener('data', listeners.onIncoming);
549+
reverseProxy.incoming.socket.destroySoon();
550+
reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
551+
reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
557552
}
558553

559554
//

0 commit comments

Comments
 (0)