FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

https: fix connection checking interval not clearing on server close · nodejs/node@2969722 · GitHub

/ node Public

Commit 2969722

Browse files
Linkgoron
authored and
targos
committed
https: fix connection checking interval not clearing on server close
The connection interval should close when httpsServer.close is called similarly to how it gets cleared when httpServer.close is called. Fixes: #48373 PR-URL: #48383 Backport-PR-URL: #50194 Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
1 parent 7fc15b6 commit 2969722

6 files changed

Lines changed: 52 additions & 3 deletions

‎lib/_http_server.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,11 @@ function setupConnectionsTracking() {
505505
setInterval(checkConnections.bind(this), this.connectionsCheckingInterval).unref();
506506
}
507507

508+
function httpServerPreClose(server) {
509+
server.closeIdleConnections();
510+
clearInterval(server[kConnectionsCheckingInterval]);
511+
}
512+
508513
function Server(options, requestListener) {
509514
if (!(this instanceof Server)) return new Server(options, requestListener);
510515

@@ -547,7 +552,7 @@ ObjectSetPrototypeOf(Server.prototype, net.Server.prototype);
547552
ObjectSetPrototypeOf(Server, net.Server);
548553

549554
Server.prototype.close = function() {
550-
clearInterval(this[kConnectionsCheckingInterval]);
555+
httpServerPreClose(this);
551556
ReflectApply(net.Server.prototype.close, this, arguments);
552557
};
553558

@@ -1190,4 +1195,6 @@ module.exports = {
11901195
storeHTTPOptions,
11911196
_connectionListener: connectionListener,
11921197
kServerResponse,
1198+
httpServerPreClose,
1199+
kConnectionsCheckingInterval,
11931200
};

‎lib/https.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const {
3131
JSONStringify,
3232
ObjectAssign,
3333
ObjectSetPrototypeOf,
34+
ReflectApply,
3435
ReflectConstruct,
3536
} = primordials;
3637

@@ -43,6 +44,7 @@ assertCrypto();
4344
const tls = require('tls');
4445
const { Agent: HttpAgent } = require('_http_agent');
4546
const {
47+
httpServerPreClose,
4648
Server: HttpServer,
4749
setupConnectionsTracking,
4850
storeHTTPOptions,
@@ -98,6 +100,11 @@ Server.prototype.closeIdleConnections = HttpServer.prototype.closeIdleConnection
98100

99101
Server.prototype.setTimeout = HttpServer.prototype.setTimeout;
100102

103+
Server.prototype.close = function() {
104+
httpServerPreClose(this);
105+
ReflectApply(tls.Server.prototype.close, this, arguments);
106+
};
107+
101108
/**
102109
* Creates a new `https.Server` instance.
103110
* @param {{

‎test/parallel/test-http-server-close-destroy-timeout.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
'use strict';
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const { createServer } = require('http');
5+
const { kConnectionsCheckingInterval } = require('_http_server');
6+
7+
const server = createServer(function(req, res) {});
8+
server.listen(0, common.mustCall(function() {
9+
assert.strictEqual(server[kConnectionsCheckingInterval]._destroyed, false);
10+
server.close(common.mustCall(() => {
11+
assert(server[kConnectionsCheckingInterval]._destroyed);
12+
}));
13+
}));

‎test/parallel/test-http-server-close-idle.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ server.listen(0, function() {
4242
assert(response.startsWith('HTTP/1.1 200 OK\r\nConnection: keep-alive'));
4343
assert.strictEqual(connections, 2);
4444

45-
server.closeIdleConnections();
4645
server.close(common.mustCall());
4746

4847
// Check that only the idle connection got closed

‎test/parallel/test-https-server-close-destroy-timeout.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
'use strict';
2+
const common = require('../common');
3+
const assert = require('assert');
4+
if (!common.hasCrypto) {
5+
common.skip('missing crypto');
6+
}
7+
8+
const { createServer } = require('https');
9+
const { kConnectionsCheckingInterval } = require('_http_server');
10+
11+
const fixtures = require('../common/fixtures');
12+
13+
const options = {
14+
key: fixtures.readKey('agent1-key.pem'),
15+
cert: fixtures.readKey('agent1-cert.pem')
16+
};
17+
18+
const server = createServer(options, function(req, res) {});
19+
server.listen(0, common.mustCall(function() {
20+
assert.strictEqual(server[kConnectionsCheckingInterval]._destroyed, false);
21+
server.close(common.mustCall(() => {
22+
assert(server[kConnectionsCheckingInterval]._destroyed);
23+
}));
24+
}));

‎test/parallel/test-https-server-close-idle.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ server.listen(0, function() {
5252
assert(response.startsWith('HTTP/1.1 200 OK\r\nConnection: keep-alive'));
5353
assert.strictEqual(connections, 2);
5454

55-
server.closeIdleConnections();
5655
server.close(common.mustCall());
5756

5857
// Check that only the idle connection got closed

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL