nodejs
diff --git a/‎src/node_http_parser.cc‎
Lines changed: 2 additions & 0 deletions b/‎src/node_http_parser.cc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎test/parallel/test-http-uncaught-from-request-callback.js‎
Lines changed: 29 additions & 0 deletions b/‎test/parallel/test-http-uncaught-from-request-callback.js‎
Lines changed: 29 additions & 0 deletions
@@ -330,6 +330,7 @@ class Parser : public AsyncWrap, public StreamListener {
           this, InternalCallbackScope::kSkipTaskQueues);
       head_response = cb.As<Function>()->Call(
           env()->context(), object(), arraysize(argv), argv);
+      if (head_response.IsEmpty()) callback_scope.MarkAsFailed();
     }
 
     int64_t val;
@@ -401,6 +402,7 @@ class Parser : public AsyncWrap, public StreamListener {
       InternalCallbackScope callback_scope(
           this, InternalCallbackScope::kSkipTaskQueues);
       r = cb.As<Function>()->Call(env()->context(), object(), 0, nullptr);
+      if (r.IsEmpty()) callback_scope.MarkAsFailed();
     }
 
     if (r.IsEmpty()) {
 
@@ -0,0 +1,29 @@
+'use strict';
+const common = require('../common');
+const asyncHooks = require('async_hooks');
+const http = require('http');
+
+// Regression test for https://github.com/nodejs/node/issues/31796
+
+asyncHooks.createHook({
+  after: () => {}
+}).enable();
+
+
+process.once('uncaughtException', common.mustCall(() => {
+  server.close();
+}));
+
+const server = http.createServer(common.mustCall((request, response) => {
+  response.writeHead(200, { 'Content-Type': 'text/plain' });
+  response.end();
+}));
+
+server.listen(0, common.mustCall(() => {
+  http.get({
+    host: 'localhost',
+    port: server.address().port
+  }, common.mustCall(() => {
+    throw new Error('whoah');
+  }));
+}));
Original file line number	Diff line number	Diff line change
@@ -330,6 +330,7 @@ class Parser : public AsyncWrap, public StreamListener {
330	330	this, InternalCallbackScope::kSkipTaskQueues);
331	331	head_response = cb.As<Function>()->Call(
332	332	env()->context(), object(), arraysize(argv), argv);
	333	+ if (head_response.IsEmpty()) callback_scope.MarkAsFailed();
333	334	}
334	335
335	336	int64_t val;
@@ -401,6 +402,7 @@ class Parser : public AsyncWrap, public StreamListener {
401	402	InternalCallbackScope callback_scope(
402	403	this, InternalCallbackScope::kSkipTaskQueues);
403	404	r = cb.As<Function>()->Call(env()->context(), object(), 0, nullptr);
	405	+ if (r.IsEmpty()) callback_scope.MarkAsFailed();
404	406	}
405	407
406	408	if (r.IsEmpty()) {