From 511230fdae1f61594808a8f547c7f3e5e46727ef Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Fri, 20 Apr 2018 00:24:49 +0200 Subject: [PATCH] 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 Reviewed-By: James M Snell --- lib/internal/child_process.js | 10 ++++ .../test-child-process-http-socket-leak.js | 56 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 test/parallel/test-child-process-http-socket-leak.js diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index 8cca1c2f6b0443..a630cff717bcad 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -31,6 +31,8 @@ const SocketList = require('internal/socket_list'); const { convertToValidSignal } = require('internal/util'); const { isUint8Array } = require('internal/util/types'); const spawn_sync = process.binding('spawn_sync'); +const { HTTPParser } = process.binding('http_parser'); +const { freeParser } = require('_http_common'); const { UV_EACCES, @@ -107,6 +109,14 @@ const handleConversion = { if (!options.keepOpen) { handle.onread = nop; 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; diff --git a/test/parallel/test-child-process-http-socket-leak.js b/test/parallel/test-child-process-http-socket-leak.js new file mode 100644 index 00000000000000..30d8601b840626 --- /dev/null +++ b/test/parallel/test-child-process-http-socket-leak.js @@ -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(); + }); +}));