fix: nodejs/node#13539

avwo · Jul 31, 2017 · 11838ea · 11838ea
1 parent 4fbfd9a
commit 11838ea
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/lib/config.js b/lib/config.js
@@ -52,16 +52,40 @@ exports.getDataDir = getDataDir;
 try {
   var async_id_symbol = process.binding('async_wrap').async_id_symbol;
 } catch (e) {}
+var emptyHandle = {
+  asyncReset: noop,
+  getAsyncId: noop
+};
 function createAgent(agentConfig, https) {
   var agent = new (https ? httpsAgent : httpAgent)(agentConfig);
   if (async_id_symbol) {
     var addRequest = agent.addRequest;
-    agent.addRequest = function(req) {
+    agent.addRequest = function(req, options) {
+      var freeSockets = this.freeSockets[this.getName(options)];
+      var mockAsyncReset;
+      if (freeSockets && freeSockets.length) {
+        var socket = freeSockets[0];
+        var handle = socket._handle;
+        if (!handle) {
+          socket._handle = emptyHandle;
+          mockAsyncReset = true;
+        } else if (typeof handle.asyncReset !== 'function') {
+          handle.asyncReset = noop;
+          mockAsyncReset = true;
+        }
+      }
       var onSocket = req.onSocket;
       req.onSocket = function(socket) {
         try {
           socket[async_id_symbol] = socket._handle.getAsyncId();
         } catch(e) {}
+        if ( mockAsyncReset) {
+          if (socket._handle === emptyHandle) {
+            delete socket._handle;
+          } else if (socket._handle.asyncReset === noop) {
+            delete socket._handle.asyncReset;
+          }
+        }
         onSocket.apply(this, arguments);
       };
       addRequest.apply(this, arguments);