Merge branch 'fix-websocket-upgrade-closed-socket'

FinnStutzenstein · FinnStutzenstein · commit 4daf81ff9e46 · 2021-09-22T12:45:05.000+02:00
diff --git a/lib/http-proxy/passes/ws-incoming.js b/lib/http-proxy/passes/ws-incoming.js
@@ -111,7 +111,7 @@ module.exports = {
     proxyReq.on('error', onOutgoingError);
     proxyReq.on('response', function (res) {
       // if upgrade event isn't going to happen, close the socket
-      if (!res.upgrade) {
+      if (!res.upgrade && socket.readyState !== "closed") {
         socket.write(createHttpHeader('HTTP/' + res.httpVersion + ' ' + res.statusCode + ' ' + res.statusMessage, res.headers));
         res.pipe(socket);
       }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ module.exports = {`
`111`	`111`	`proxyReq.on('error', onOutgoingError);`
`112`	`112`	`proxyReq.on('response', function (res) {`
`113`	`113`	`// if upgrade event isn't going to happen, close the socket`
`114`		`- if (!res.upgrade) {`
	`114`	`+ if (!res.upgrade && socket.readyState !== "closed") {`
`115`	`115`	`socket.write(createHttpHeader('HTTP/' + res.httpVersion + ' ' + res.statusCode + ' ' + res.statusMessage, res.headers));`
`116`	`116`	`res.pipe(socket);`
`117`	`117`	`}`