Commit d5577f0
committed
http: remove default 'timeout' listener on upgrade
Remove the default listener of the `'timeout'` event from the socket
before emitting the `'connect'` or `'upgrade'` event.
PR-URL: #26030
Fixes: #23857
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent a18e27d commit d5577f0
3 files changed
Lines changed: 9 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -465,6 +465,10 @@ function socketOnData(d) { | |||
| 465 | 465 | socket.removeListener('data', socketOnData); | |
| 466 | 466 | socket.removeListener('end', socketOnEnd); | |
| 467 | 467 | socket.removeListener('drain', ondrain); | |
| 468 | + | ||
| 469 | + if (req.timeoutCb) | ||
| 470 | + socket.removeListener('timeout', req.timeoutCb); | ||
| 471 | + | ||
| 468 | 472 | parser.finish(); | |
| 469 | 473 | freeParser(parser, req, socket); | |
| 470 | 474 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -568,6 +568,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { | |||
| 568 | 568 | socket.removeListener('drain', state.onDrain); | |
| 569 | 569 | socket.removeListener('drain', ondrain); | |
| 570 | 570 | socket.removeListener('error', socketOnError); | |
| 571 | + socket.removeListener('timeout', socketOnTimeout); | ||
| 571 | 572 | unconsume(parser, socket); | |
| 572 | 573 | parser.finish(); | |
| 573 | 574 | freeParser(parser, req, socket); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,6 +36,7 @@ server.on('connect', common.mustCall((req, socket, firstBodyChunk) => { | |||
| 36 | 36 | assert.strictEqual(socket.listenerCount('data'), 0); | |
| 37 | 37 | assert.strictEqual(socket.listenerCount('end'), 1); | |
| 38 | 38 | assert.strictEqual(socket.listenerCount('error'), 0); | |
| 39 | + assert.strictEqual(socket.listenerCount('timeout'), 0); | ||
| 39 | 40 | ||
| 40 | 41 | socket.write('HTTP/1.1 200 Connection established\r\n\r\n'); | |
| 41 | 42 | ||
@@ -53,7 +54,8 @@ server.listen(0, common.mustCall(() => { | |||
| 53 | 54 | const req = http.request({ | |
| 54 | 55 | port: server.address().port, | |
| 55 | 56 | method: 'CONNECT', | |
| 56 | - path: 'google.com:443' | ||
| 57 | + path: 'google.com:443', | ||
| 58 | + timeout: 20000 | ||
| 57 | 59 | }, common.mustNotCall()); | |
| 58 | 60 | ||
| 59 | 61 | req.on('socket', common.mustCall((socket) => { | |
@@ -80,6 +82,7 @@ server.listen(0, common.mustCall(() => { | |||
| 80 | 82 | assert.strictEqual(socket.listenerCount('close'), 0); | |
| 81 | 83 | assert.strictEqual(socket.listenerCount('error'), 0); | |
| 82 | 84 | assert.strictEqual(socket.listenerCount('agentRemove'), 0); | |
| 85 | + assert.strictEqual(socket.listenerCount('timeout'), 0); | ||
| 83 | 86 | ||
| 84 | 87 | let data = firstBodyChunk.toString(); | |
| 85 | 88 | socket.on('data', (buf) => { | |
0 commit comments