summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTim De Pauw <timdp@users.noreply.github.com>2019-01-16 14:31:33 +0100
committerDaniel Bevenius <daniel.bevenius@gmail.com>2019-01-22 05:25:47 +0100
commit1b11824f514ac6fea77b7ae7b92e2ab64d970351 (patch)
treebc36efc3cdcc353c401612f5fb807affa0f7c779 /lib
parentecf693697b097c2cd75df303e71d9cfa859b72c0 (diff)
downloadandroid-node-v8-1b11824f514ac6fea77b7ae7b92e2ab64d970351.tar.gz
android-node-v8-1b11824f514ac6fea77b7ae7b92e2ab64d970351.tar.bz2
android-node-v8-1b11824f514ac6fea77b7ae7b92e2ab64d970351.zip
http: make ClientRequest#setTimeout() noop at end
Originally discovered and resolved by @szmarczak. PR-URL: https://github.com/nodejs/node/pull/25536 Fixes: https://github.com/nodejs/node/issues/25499 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/_http_client.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/_http_client.js b/lib/_http_client.js
index 95488bc5e7..943441f1a1 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -731,6 +731,10 @@ function _deferToConnect(method, arguments_, cb) {
}
ClientRequest.prototype.setTimeout = function setTimeout(msecs, callback) {
+ if (this._ended) {
+ return this;
+ }
+
listenSocketTimeout(this);
msecs = validateTimerDuration(msecs);
if (callback) this.once('timeout', callback);