Skip to content

Commit 2b7f920

Browse files
lpincaBridgeAR
authored andcommitted
http: remove default 'drain' listener on upgrade
Ensure that the default `'drain'` listener is removed before the `'connect'` or `'upgrade'` event is emitted. PR-URL: #18866 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent ffab6cd commit 2b7f920

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/_http_client.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const { OutgoingMessage } = require('_http_outgoing');
3737
const Agent = require('_http_agent');
3838
const { Buffer } = require('buffer');
3939
const { urlToOptions, searchParamsSymbol } = require('internal/url');
40-
const { outHeadersKey } = require('internal/http');
40+
const { outHeadersKey, ondrain } = require('internal/http');
4141
const { nextTick } = require('internal/process/next_tick');
4242
const errors = require('internal/errors');
4343

@@ -424,6 +424,7 @@ function socketOnData(d) {
424424

425425
socket.removeListener('data', socketOnData);
426426
socket.removeListener('end', socketOnEnd);
427+
socket.removeListener('drain', ondrain);
427428
parser.finish();
428429
freeParser(parser, req, socket);
429430

test/parallel/test-http-connect.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ server.listen(0, common.mustCall(() => {
7474
assert.strictEqual(socket._httpMessage, null);
7575
assert.strictEqual(socket.listeners('connect').length, 0);
7676
assert.strictEqual(socket.listeners('data').length, 0);
77+
assert.strictEqual(socket.listeners('drain').length, 0);
7778

7879
// the stream.Duplex onend listener
7980
// allow 0 here, so that i can run the same test on streams1 impl

0 commit comments

Comments
 (0)