Skip to content

Commit 3c05b03

Browse files
lpincaMylesBorins
authored andcommitted
http: do not rely on the 'agentRemove' event
Do not use the `'agentRemove'` event to null `socket._httpMessage` as that event is public and can be used to not keep a request in the agent. PR-URL: #20786Fixes: #20690 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
1 parent 275907f commit 3c05b03

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

‎lib/_http_agent.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ function installListeners(agent, s, options) {
276276
s.removeListener('close',onClose);
277277
s.removeListener('free',onFree);
278278
s.removeListener('agentRemove',onRemove);
279-
s._httpMessage=null;
280279
}
281280
s.on('agentRemove',onRemove);
282281
}

‎lib/_http_client.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ function socketOnData(d) {
459459
socket.removeListener('close',socketCloseListener);
460460
socket.removeListener('error',socketErrorListener);
461461

462+
socket._httpMessage=null;
462463
socket.readableFlowing=null;
463464

464465
req.emit(eventName,res,socket,bodyHead);
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
'use strict';
2+
const{ mustCall }=require('../common');
3+
4+
consthttp=require('http');
5+
const{ strictEqual }=require('assert');
6+
7+
constserver=http.createServer(mustCall((req,res)=>{
8+
res.flushHeaders();
9+
}));
10+
11+
server.listen(0,mustCall(()=>{
12+
constreq=http.get({
13+
port: server.address().port
14+
},mustCall(()=>{
15+
const{ socket }=req;
16+
socket.emit('agentRemove');
17+
strictEqual(socket._httpMessage,req);
18+
socket.destroy();
19+
server.close();
20+
}));
21+
}));

0 commit comments

Comments
 (0)