nodejs
diff --git a/‎lib/_http_server.js‎
Lines changed: 16 additions & 5 deletions b/‎lib/_http_server.js‎
Lines changed: 16 additions & 5 deletions
diff --git a/‎lib/https.js‎
Lines changed: 2 additions & 1 deletion b/‎lib/https.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎test/parallel/test-http-server-connections-checking-leak.js‎
Lines changed: 24 additions & 0 deletions b/‎test/parallel/test-http-server-connections-checking-leak.js‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎test/parallel/test-https-server-connections-checking-leak.js‎
Lines changed: 29 additions & 0 deletions b/‎test/parallel/test-https-server-connections-checking-leak.js‎
Lines changed: 29 additions & 0 deletions
@@ -493,14 +493,16 @@ function storeHTTPOptions(options) {
   }
 }
 
-function setupConnectionsTracking(server) {
+function setupConnectionsTracking() {
   // Start connection handling
-  server[kConnections] = new ConnectionsList();
+  if (!this[kConnections]) {
+    this[kConnections] = new ConnectionsList();
+  }
 
   // This checker is started without checking whether any headersTimeout or requestTimeout is non zero
   // otherwise it would not be started if such timeouts are modified after createServer.
-  server[kConnectionsCheckingInterval] =
-    setInterval(checkConnections.bind(server), server.connectionsCheckingInterval).unref();
+  this[kConnectionsCheckingInterval] =
+    setInterval(checkConnections.bind(this), this.connectionsCheckingInterval).unref();
 }
 
 function Server(options, requestListener) {
@@ -533,11 +535,12 @@ function Server(options, requestListener) {
   this.httpAllowHalfOpen = false;
 
   this.on('connection', connectionListener);
+  this.on('listening', setupConnectionsTracking);
 
   this.timeout = 0;
   this.maxHeadersCount = null;
   this.maxRequestsPerSocket = 0;
-  setupConnectionsTracking(this);
+
   this[kUniqueHeaders] = parseUniqueHeadersOption(options.uniqueHeaders);
 }
 ObjectSetPrototypeOf(Server.prototype, net.Server.prototype);
@@ -549,6 +552,10 @@ Server.prototype.close = function() {
 };
 
 Server.prototype.closeAllConnections = function() {
+  if (!this[kConnections]) {
+    return;
+  }
+
   const connections = this[kConnections].all();
 
   for (let i = 0, l = connections.length; i < l; i++) {
@@ -557,6 +564,10 @@ Server.prototype.closeAllConnections = function() {
 };
 
 Server.prototype.closeIdleConnections = function() {
+  if (!this[kConnections]) {
+    return;
+  }
+
   const connections = this[kConnections].idle();
 
   for (let i = 0, l = connections.length; i < l; i++) {
 
@@ -86,8 +86,9 @@ function Server(opts, requestListener) {
 
   this.timeout = 0;
   this.maxHeadersCount = null;
-  setupConnectionsTracking(this);
+  this.on('listening', setupConnectionsTracking);
 }
+
 ObjectSetPrototypeOf(Server.prototype, tls.Server.prototype);
 ObjectSetPrototypeOf(Server, tls.Server);
 
 
@@ -0,0 +1,24 @@
+'use strict';
+
+// Flags: --expose-gc
+
+// Check that creating a server without listening does not leak resources.
+
+require('../common');
+const onGC = require('../common/ongc');
+const Countdown = require('../common/countdown');
+
+const http = require('http');
+const max = 100;
+
+// Note that Countdown internally calls common.mustCall, that's why it's not done here.
+const countdown = new Countdown(max, () => {});
+
+for (let i = 0; i < max; i++) {
+  const server = http.createServer((req, res) => {});
+  onGC(server, { ongc: countdown.dec.bind(countdown) });
+}
+
+setImmediate(() => {
+  global.gc();
+});
@@ -0,0 +1,29 @@
+'use strict';
+
+// Flags: --expose-gc
+
+// Check that creating a server without listening does not leak resources.
+
+const common = require('../common');
+
+if (!common.hasCrypto) {
+  common.skip('missing crypto');
+}
+
+const onGC = require('../common/ongc');
+const Countdown = require('../common/countdown');
+
+const https = require('https');
+const max = 100;
+
+// Note that Countdown internally calls common.mustCall, that's why it's not done here.
+const countdown = new Countdown(max, () => {});
+
+for (let i = 0; i < max; i++) {
+  const server = https.createServer((req, res) => {});
+  onGC(server, { ongc: countdown.dec.bind(countdown) });
+}
+
+setImmediate(() => {
+  global.gc();
+});
Original file line number	Diff line number	Diff line change
@@ -86,8 +86,9 @@ function Server(opts, requestListener) {
86	86
87	87	this.timeout = 0;
88	88	this.maxHeadersCount = null;
89		- setupConnectionsTracking(this);
	89	+ this.on('listening', setupConnectionsTracking);
90	90	}
	91	+
91	92	ObjectSetPrototypeOf(Server.prototype, tls.Server.prototype);
92	93	ObjectSetPrototypeOf(Server, tls.Server);
93	94