From 83c4071af871fc188298d7d591e95670bf9f9085 Mon Sep 17 00:00:00 2001
From: Damien Arrachequesne <damien.arrachequesne@gmail.com>
Date: Sun, 20 Nov 2022 02:23:53 +0100
Subject: [PATCH 1/2] fix: catch errors when destroying invalid upgrades

Before this change, receiving an HTTP2 upgrade would make the server
crash:

> Error: read ECONNRESET
>    at TCP.onStreamRead (node:internal/stream_base_commons:217:20) {
>  errno: -104,
>  code: 'ECONNRESET',
>  syscall: 'read'
> }

This can be reproduced with Node.js v14.15.3, v16.18.1 and v18.12.1.

Backported from https://github.com/socketio/engine.io/commit/425e833ab13373edf1dd5a0706f07100db14e3c6
---
 lib/server.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/server.js b/lib/server.js
index 4f2b8733..1ffce26b 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -487,6 +487,9 @@ Server.prototype.attach = function (server, options) {
         // then the socket needs to die!
         setTimeout(function () {
           if (socket.writable && socket.bytesWritten <= 0) {
+            socket.on('error', e => {
+              debug('error while destroying upgrade: %s', e.message);
+            });
             return socket.end();
           }
         }, destroyUpgradeTimeout);

From 67a3a8785900f77d8ad40c3c1eea8ee188c42d95 Mon Sep 17 00:00:00 2001
From: Damien Arrachequesne <damien.arrachequesne@gmail.com>
Date: Sun, 20 Nov 2022 02:25:19 +0100
Subject: [PATCH 2/2] chore(release): 3.6.1

Diff: https://github.com/socketio/engine.io/compare/3.6.0...3.6.1
---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8703808..82c18730 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [3.6.1](https://github.com/socketio/engine.io/compare/3.6.0...3.6.1) (2022-11-20)
+
+
+### Bug Fixes
+
+* catch errors when destroying invalid upgrades ([83c4071](https://github.com/socketio/engine.io/commit/83c4071af871fc188298d7d591e95670bf9f9085))
+
+
+
 # [3.6.0](https://github.com/socketio/engine.io/compare/3.5.0...3.6.0) (2022-06-06)
 
 
diff --git a/package.json b/package.json
index ce815e91..9cc212df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "The realtime engine behind Socket.IO. Provides the foundation of a bidirectional connection between client and server",
   "main": "lib/engine.io.js",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",