Skip to content

Commit cc02c73

Browse files
leidegrecodebytere
authored andcommitted
http: fixes memory retention issue with FreeList and HTTPParser
Fixes: #29394 Refs: #33167 (comment) PR-URL: #33190 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
1 parent c5a38fe commit cc02c73

2 files changed

Lines changed: 44 additions & 2 deletions

File tree

‎lib/_http_common.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,10 @@ const parsers = new FreeList('parsers', 1000, function parsersCb() {
161161

162162
cleanParser(parser);
163163

164-
parser.onIncoming=null;
165164
parser[kOnHeaders]=parserOnHeaders;
166165
parser[kOnHeadersComplete]=parserOnHeadersComplete;
167166
parser[kOnBody]=parserOnBody;
168167
parser[kOnMessageComplete]=parserOnMessageComplete;
169-
parser[kOnTimeout]=null;
170168

171169
returnparser;
172170
});
@@ -232,7 +230,9 @@ function cleanParser(parser) {
232230
parser.outgoing=null;
233231
parser.maxHeaderPairs=MAX_HEADER_PAIRS;
234232
parser[kOnExecute]=null;
233+
parser[kOnTimeout]=null;
235234
parser._consumed=false;
235+
parser.onIncoming=null;
236236
}
237237

238238
functionprepareError(err,parser,rawPacket){
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
const{ HTTPParser }=require('_http_common');
7+
8+
// Test that the `HTTPParser` instance is cleaned up before being returned to
9+
// the pool to avoid memory retention issues.
10+
11+
constkOnTimeout=HTTPParser.kOnTimeout|0;
12+
constserver=http.createServer();
13+
14+
server.on('request',common.mustCall((request,response)=>{
15+
constparser=request.socket.parser;
16+
17+
assert.strictEqual(typeofparser[kOnTimeout],'function');
18+
19+
request.socket.on('close',common.mustCall(()=>{
20+
assert.strictEqual(parser[kOnTimeout],null);
21+
}));
22+
23+
response.end();
24+
server.close();
25+
}));
26+
27+
server.listen(common.mustCall(()=>{
28+
constrequest=http.get({port: server.address().port});
29+
letparser;
30+
31+
request.on('socket',common.mustCall(()=>{
32+
parser=request.parser;
33+
assert.strictEqual(typeofparser.onIncoming,'function');
34+
}));
35+
36+
request.on('response',common.mustCall((response)=>{
37+
response.resume();
38+
response.on('end',common.mustCall(()=>{
39+
assert.strictEqual(parser.onIncoming,null);
40+
}));
41+
}));
42+
}));

0 commit comments

Comments
 (0)