nodejs
diff --git a/‎lib/_http_server.js‎
Lines changed: 4 additions & 2 deletions b/‎lib/_http_server.js‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎lib/net.js‎
Lines changed: 13 additions & 0 deletions b/‎lib/net.js‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎test/parallel/test-net-server-capture-rejection.js‎
Lines changed: 27 additions & 0 deletions b/‎test/parallel/test-net-server-capture-rejection.js‎
Lines changed: 27 additions & 0 deletions
@@ -359,10 +359,11 @@ Server.prototype.setTimeout = function setTimeout(msecs, callback) {
 };
 
 Server.prototype[EE.captureRejectionSymbol] = function(
-  err, event, req, res) {
+  err, event, ...args) {
 
   switch (event) {
     case 'request':
+      const [ , res] = args;
       if (!res.headersSent && !res.writableEnded) {
         // Don't leak headers.
         for (const name of res.getHeaderNames()) {
@@ -375,7 +376,8 @@ Server.prototype[EE.captureRejectionSymbol] = function(
       }
       break;
     default:
-      this.emit('error', err);
+      net.Server.prototype[Symbol.for('nodejs.rejection')]
+        .call(this, err, event, ...args);
   }
 };
 
 
@@ -1653,6 +1653,19 @@ function emitCloseNT(self) {
 }
 
 
+Server.prototype[EventEmitter.captureRejectionSymbol] = function(
+  err, event, sock) {
+
+  switch (event) {
+    case 'connection':
+      sock.destroy(err);
+      break;
+    default:
+      this.emit('error', err);
+  }
+};
+
+
 // Legacy alias on the C++ wrapper object. This is not public API, so we may
 // want to runtime-deprecate it at some point. There's no hurry, though.
 ObjectDefineProperty(TCP.prototype, 'owner', {
 
@@ -0,0 +1,27 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const events = require('events');
+const { createServer, connect } = require('net');
+
+events.captureRejections = true;
+
+const server = createServer(common.mustCall(async (sock) => {
+  server.close();
+
+  const _err = new Error('kaboom');
+  sock.on('error', common.mustCall((err) => {
+    assert.strictEqual(err, _err);
+  }));
+  throw _err;
+}));
+
+server.listen(0, common.mustCall(() => {
+  const sock = connect(
+    server.address().port,
+    server.address().host
+  );
+
+  sock.on('close', common.mustCall());
+}));