summaryrefslogtreecommitdiff
path: root/lib/_http_agent.js
diff options
context:
space:
mode:
authorBastian Krol <bastian.krol@instana.com>2018-10-01 17:11:25 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2018-10-10 08:45:56 +0200
commiteb9748d222061381236f19cbe162cf9eb2e034ad (patch)
tree88d7412a51fc3966d059cff654002c4d9b160348 /lib/_http_agent.js
parent45c70b0ce79c5c606247356bf4697dae6f60c810 (diff)
downloadandroid-node-v8-eb9748d222061381236f19cbe162cf9eb2e034ad.tar.gz
android-node-v8-eb9748d222061381236f19cbe162cf9eb2e034ad.tar.bz2
android-node-v8-eb9748d222061381236f19cbe162cf9eb2e034ad.zip
async_hooks: add missing async_hooks destroys in AsyncReset
This adds missing async_hooks destroy calls for sockets (in _http_agent.js) and HTTP parsers. We need to emit a destroy in AsyncWrap#AsyncReset before assigning a new async_id when the instance has already been in use and is being recycled, because in that case, we have already emitted an init for the "old" async_id. This also removes a duplicated init call for HTTP parser: Each time a new parser was created, AsyncReset was being called via the C++ Parser class constructor (super constructor AsyncWrap) and also via Parser::Reinitialize. PR-URL: https://github.com/nodejs/node/pull/23272 Fixes: https://github.com/nodejs/node/issues/19859 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib/_http_agent.js')
-rw-r--r--lib/_http_agent.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/_http_agent.js b/lib/_http_agent.js
index 1a2920cf09..97c5ab604f 100644
--- a/lib/_http_agent.js
+++ b/lib/_http_agent.js
@@ -167,7 +167,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
var socket = this.freeSockets[name].shift();
// Guard against an uninitialized or user supplied Socket.
if (socket._handle && typeof socket._handle.asyncReset === 'function') {
- // Assign the handle a new asyncId and run any init() hooks.
+ // Assign the handle a new asyncId and run any destroy()/init() hooks.
socket._handle.asyncReset();
socket[async_id_symbol] = socket._handle.getAsyncId();
}