1 files changed, 21 insertions, 0 deletions
diff --git a/lib/_http_server.js b/lib/_http_server.js
index 6c52f7adbc..3444c44a6c 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -27,6 +27,7 @@ const {
 } = primordials;
 
 const net = require('net');
+const EE = require('events');
 const assert = require('internal/assert');
 const {
   parsers,
@@ -357,6 +358,26 @@ Server.prototype.setTimeout = function setTimeout(msecs, callback) {
   return this;
 };
 
+Server.prototype[EE.captureRejectionSymbol] = function(
+  err, event, req, res) {
+
+  switch (event) {
+    case 'request':
+      if (!res.headersSent && !res.writableEnded) {
+        // Don't leak headers.
+        for (const name of res.getHeaderNames()) {
+          res.removeHeader(name);
+        }
+        res.statusCode = 500;
+        res.end(STATUS_CODES[500]);
+      } else {
+        res.destroy();
+      }
+      break;
+    default:
+      this.emit('error', err);
+  }
+};
 
 function connectionListener(socket) {
   defaultTriggerAsyncIdScope(