child_process: fix leak when passing http sockets
After passing an HTTP socket, release its associated resources. PR-URL: https://github.com/nodejs/node/pull/20305 Fixes: https://github.com/nodejs/node/issues/15651 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
60b5b38b48
commit
511230fdae
@ -31,6 +31,8 @@ const SocketList = require('internal/socket_list');
|
|||||||
const { convertToValidSignal } = require('internal/util');
|
const { convertToValidSignal } = require('internal/util');
|
||||||
const { isUint8Array } = require('internal/util/types');
|
const { isUint8Array } = require('internal/util/types');
|
||||||
const spawn_sync = process.binding('spawn_sync');
|
const spawn_sync = process.binding('spawn_sync');
|
||||||
|
const { HTTPParser } = process.binding('http_parser');
|
||||||
|
const { freeParser } = require('_http_common');
|
||||||
|
|
||||||
const {
|
const {
|
||||||
UV_EACCES,
|
UV_EACCES,
|
||||||
@ -107,6 +109,14 @@ const handleConversion = {
|
|||||||
if (!options.keepOpen) {
|
if (!options.keepOpen) {
|
||||||
handle.onread = nop;
|
handle.onread = nop;
|
||||||
socket._handle = null;
|
socket._handle = null;
|
||||||
|
socket.setTimeout(0);
|
||||||
|
// In case of an HTTP connection socket, release the associated
|
||||||
|
// resources
|
||||||
|
if (socket.parser && socket.parser instanceof HTTPParser) {
|
||||||
|
freeParser(socket.parser, null, socket);
|
||||||
|
if (socket._httpMessage)
|
||||||
|
socket._httpMessage.detachSocket(socket);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return handle;
|
return handle;
|
||||||
|
56
test/parallel/test-child-process-http-socket-leak.js
Normal file
56
test/parallel/test-child-process-http-socket-leak.js
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
// Flags: --expose_internals
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
const common = require('../common');
|
||||||
|
const assert = require('assert');
|
||||||
|
const { fork } = require('child_process');
|
||||||
|
const http = require('http');
|
||||||
|
const { kTimeout } = require('internal/timers');
|
||||||
|
|
||||||
|
if (process.argv[2] === 'child') {
|
||||||
|
process.once('message', (req, socket) => {
|
||||||
|
const res = new http.ServerResponse(req);
|
||||||
|
res.assignSocket(socket);
|
||||||
|
res.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
process.send('ready');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let child;
|
||||||
|
let socket;
|
||||||
|
|
||||||
|
const server = http.createServer(common.mustCall((req, res) => {
|
||||||
|
const r = {
|
||||||
|
method: req.method,
|
||||||
|
headers: req.headers,
|
||||||
|
path: req.path,
|
||||||
|
httpVersionMajor: req.httpVersionMajor,
|
||||||
|
query: req.query,
|
||||||
|
};
|
||||||
|
|
||||||
|
socket = res.socket;
|
||||||
|
child.send(r, socket);
|
||||||
|
server.close();
|
||||||
|
}));
|
||||||
|
|
||||||
|
server.listen(0, common.mustCall(() => {
|
||||||
|
child = fork(__filename, [ 'child' ]);
|
||||||
|
child.once('message', (msg) => {
|
||||||
|
assert.strictEqual(msg, 'ready');
|
||||||
|
const req = http.request({
|
||||||
|
port: server.address().port,
|
||||||
|
}, common.mustCall((res) => {
|
||||||
|
res.on('data', () => {});
|
||||||
|
res.on('end', common.mustCall(() => {
|
||||||
|
assert.strictEqual(socket[kTimeout]._idleTimeout, -1);
|
||||||
|
assert.strictEqual(socket.parser, null);
|
||||||
|
assert.strictEqual(socket._httpMessage, null);
|
||||||
|
}));
|
||||||
|
}));
|
||||||
|
|
||||||
|
req.end();
|
||||||
|
});
|
||||||
|
}));
|
Loading…
x
Reference in New Issue
Block a user