https: set requestTimeout default to 0

ronag · joesepi · commit dc55983d79a7 · 2020-10-22T18:30:33.000-04:00
Fixes: nodejs#35261 PR-URL: nodejs#35264 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -373,7 +373,7 @@ function Server(options, requestListener) {
   this.keepAliveTimeout = 5000;
   this.maxHeadersCount = null;
   this.headersTimeout = 60 * 1000; // 60 seconds
-  this.requestTimeout = 0; // 120 seconds
+  this.requestTimeout = 0;
 }
 ObjectSetPrototypeOf(Server.prototype, net.Server.prototype);
 ObjectSetPrototypeOf(Server, net.Server);
diff --git a/lib/https.js b/lib/https.js
@@ -80,7 +80,7 @@ function Server(opts, requestListener) {
   this.keepAliveTimeout = 5000;
   this.maxHeadersCount = null;
   this.headersTimeout = 60 * 1000; // 60 seconds
-  this.requestTimeout = 120 * 1000; // 120 seconds
+  this.requestTimeout = 0;
 }
 ObjectSetPrototypeOf(Server.prototype, tls.Server.prototype);
 ObjectSetPrototypeOf(Server, tls.Server);
diff --git a/test/parallel/test-https-server-request-timeout.js b/test/parallel/test-https-server-request-timeout.js
@@ -0,0 +1,21 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const assert = require('assert');
+const { createServer } = require('https');
+const fixtures = require('../common/fixtures');
+
+const options = {
+  key: fixtures.readKey('agent1-key.pem'),
+  cert: fixtures.readKey('agent1-cert.pem')
+};
+
+const server = createServer(options);
+
+// 0 seconds is the default
+assert.strictEqual(server.requestTimeout, 0);
+const requestTimeout = common.platformTimeout(1000);
+server.requestTimeout = requestTimeout;
+assert.strictEqual(server.requestTimeout, requestTimeout);

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ function Server(options, requestListener) {`
`373`	`373`	`this.keepAliveTimeout = 5000;`
`374`	`374`	`this.maxHeadersCount = null;`
`375`	`375`	`this.headersTimeout = 60 * 1000; // 60 seconds`
`376`		`- this.requestTimeout = 0; // 120 seconds`
	`376`	`+ this.requestTimeout = 0;`
`377`	`377`	`}`
`378`	`378`	`ObjectSetPrototypeOf(Server.prototype, net.Server.prototype);`
`379`	`379`	`ObjectSetPrototypeOf(Server, net.Server);`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ function Server(opts, requestListener) {`
`80`	`80`	`this.keepAliveTimeout = 5000;`
`81`	`81`	`this.maxHeadersCount = null;`
`82`	`82`	`this.headersTimeout = 60 * 1000; // 60 seconds`
`83`		`- this.requestTimeout = 120 * 1000; // 120 seconds`
	`83`	`+ this.requestTimeout = 0;`
`84`	`84`	`}`
`85`	`85`	`ObjectSetPrototypeOf(Server.prototype, tls.Server.prototype);`
`86`	`86`	`ObjectSetPrototypeOf(Server, tls.Server);`