http: free listeners on free sockets

Reduced memory usage by ensuring free sockets don't have extra listeners while in the pool. PR-URL: #29259 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Jan 3, 2020 · 1b720aa · 1b720aa
1 parent 892e7b0
commit 1b720aa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -618,6 +618,8 @@ function responseKeepAlive(req) {
   }
   socket.removeListener('close', socketCloseListener);
   socket.removeListener('error', socketErrorListener);
+  socket.removeListener('data', socketOnData);
+  socket.removeListener('end', socketOnEnd);
   socket.once('error', freeSocketErrorListener);
   // There are cases where _handle === null. Avoid those. Passing null to
   // nextTick() will call getDefaultTriggerAsyncId() to retrieve the id.

diff --git a/test/parallel/test-http-agent-keepalive.js b/test/parallel/test-http-agent-keepalive.js
@@ -140,9 +140,21 @@ server.listen(0, common.mustCall(() => {
 
 // Check for listener leaks when reusing sockets.
 function checkListeners(socket) {
-  assert.strictEqual(socket.listenerCount('data'), 1);
-  assert.strictEqual(socket.listenerCount('drain'), 1);
+  const callback = common.mustCall(() => {
+    if (!socket.destroyed) {
+      assert.strictEqual(socket.listenerCount('data'), 0);
+      assert.strictEqual(socket.listenerCount('drain'), 0);
+      // Sockets have freeSocketErrorListener.
+      assert.strictEqual(socket.listenerCount('error'), 1);
+      // Sockets have onReadableStreamEnd.
+      assert.strictEqual(socket.listenerCount('end'), 1);
+    }
+
+    socket.off('free', callback);
+    socket.off('close', callback);
+  });
   assert.strictEqual(socket.listenerCount('error'), 1);
-  // Sockets have onReadableStreamEnd.
   assert.strictEqual(socket.listenerCount('end'), 2);
+  socket.once('free', callback);
+  socket.once('close', callback);
 }