http: remove closeIdleConnections function while calling server close

kumarrishav · richardlau · commit 6689a9848803 · 2024-04-17T12:02:53.000Z
Correcting the #50194 backporting mistake. closeIdleConnections shouldnot be called while server.close in node v18. This behavior is for node v19 and above. Fixes: #52330 Fixes: #51677 PR-URL: #52336 Refs: #50194 Reviewed-By: Nitzan Uziely <linkgoron@gmail.com>
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-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-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

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,6 @@ function setupConnectionsTracking() {`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`function httpServerPreClose(server) {`
`509`		`- server.closeIdleConnections();`
`510`	`509`	`clearInterval(server[kConnectionsCheckingInterval]);`
`511`	`510`	`}`
`512`	`511`