nodejs
diff --git a/‎lib/_http_client.js‎
Lines changed: 2 additions & 0 deletions b/‎lib/_http_client.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎test/parallel/test-http-agent-keepalive.js‎
Lines changed: 15 additions & 3 deletions b/‎test/parallel/test-http-agent-keepalive.js‎
Lines changed: 15 additions & 3 deletions
@@ -620,6 +620,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.
 
@@ -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);
 }
Original file line number	Diff line number	Diff line change
@@ -620,6 +620,8 @@ function responseKeepAlive(req) {
620	620	}
621	621	socket.removeListener('close', socketCloseListener);
622	622	socket.removeListener('error', socketErrorListener);
	623	+ socket.removeListener('data', socketOnData);
	624	+ socket.removeListener('end', socketOnEnd);
623	625	socket.once('error', freeSocketErrorListener);
624	626	// There are cases where _handle === null. Avoid those. Passing null to
625	627	// nextTick() will call getDefaultTriggerAsyncId() to retrieve the id.