http: remove closeIdleConnections function while calling server close

Correcting the nodejs#50194 backporting mistake. closeIdleConnections shouldnot be called while server.close in node v18. This behavior is for node v19 and above. fixes: nodejs#52330, nodejs#51677
kumarrishav · Apr 2, 2024 · 1a435a9 · 1a435a9
1 parent 8c8961d
commit 1a435a9
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 38 deletions.
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -506,7 +506,6 @@ function setupConnectionsTracking() {
 }
 
 function httpServerPreClose(server) {
-  server.closeIdleConnections();
   clearInterval(server[kConnectionsCheckingInterval]);
 }
 

diff --git a/test/parallel/test-http-server-close-destroy-timeout.js b/test/parallel/test-http-server-close-destroy-timeout.js
diff --git a/test/parallel/test-http-server-close-idle.js b/test/parallel/test-http-server-close-idle.js
@@ -42,6 +42,7 @@ server.listen(0, function() {
         assert(response.startsWith('HTTP/1.1 200 OK\r\nConnection: keep-alive'));
         assert.strictEqual(connections, 2);
 
+        server.closeIdleConnections();
         server.close(common.mustCall());
 
         // Check that only the idle connection got closed

diff --git a/test/parallel/test-https-server-close-destroy-timeout.js b/test/parallel/test-https-server-close-destroy-timeout.js
diff --git a/test/parallel/test-https-server-close-idle.js b/test/parallel/test-https-server-close-idle.js
@@ -52,6 +52,7 @@ server.listen(0, function() {
         assert(response.startsWith('HTTP/1.1 200 OK\r\nConnection: keep-alive'));
         assert.strictEqual(connections, 2);
 
+        server.closeIdleConnections();
         server.close(common.mustCall());
 
         // Check that only the idle connection got closed