src,http: fix uncaughtException miss in http

If the call to MakeCallback is currently in_makecallback() then return
the empty handle instead of Undefined. This allows the error to
propagate through multiple MakeCallback calls.

src/async-wrap.cc

@@ -220,7 +220,10 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
   }
 
   if (ret.IsEmpty()) {
-    return Undefined(env()->isolate());
+    if (callback_scope.in_makecallback())
+      return ret;
+    else
+      return Undefined(env()->isolate());
   }
 
   if (has_domain) {

src/node.cc

@@ -1185,7 +1185,10 @@ Local<Value> MakeCallback(Environment* env,
   }
 
   if (ret.IsEmpty()) {
-    return Undefined(env->isolate());
+    if (callback_scope.in_makecallback())
+      return ret;
+    else
+      return Undefined(env->isolate());
   }
 
   if (has_domain) {

test/parallel/test-http-catch-uncaughtexception.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+const uncaughtCallback = common.mustCall(function(er) {
+  assert.equal(er.message, 'get did fail');
+});
+
+process.on('uncaughtException', uncaughtCallback);
+
+const server = http.createServer(function(req, res) {
+  res.writeHead(200, { 'Content-Type': 'text/plain' });
+  res.end('bye');
+}).listen(common.PORT, function() {
+  http.get({ port: common.PORT }, function(res) {
+    res.resume();
+    throw new Error('get did fail');
+  }).on('close', function() {
+    server.close();
+  });
+});