http: response should always emit 'close'

ronag · targos · commit 825a68342361 · 2021-11-06T10:56:44.000+01:00
Fixes: #40528 PR-URL: #40543 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -839,7 +839,7 @@ function resOnFinish(req, res, socket, state, server) {
 }
 
 function emitCloseNT(self) {
-  if (!self.destroyed) {
+  if (!self._closed) {
     self.destroyed = true;
     self._closed = true;
     self.emit('close');
diff --git a/test/parallel/test-http-response-close.js b/test/parallel/test-http-response-close.js
@@ -78,3 +78,25 @@ const assert = require('assert');
     })
   );
 }
+
+{
+  const server = http.createServer(
+    common.mustCall((req, res) => {
+      res.on('close', common.mustCall());
+      res.destroy();
+    })
+  );
+
+  server.listen(
+    0,
+    common.mustCall(() => {
+      http.get(
+        { port: server.address().port },
+        common.mustNotCall()
+      )
+      .on('error', common.mustCall(() => {
+        server.close();
+      }));
+    })
+  );
+}

Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,7 @@ function resOnFinish(req, res, socket, state, server) {`
`839`	`839`	`}`
`840`	`840`
`841`	`841`	`function emitCloseNT(self) {`
`842`		`- if (!self.destroyed) {`
	`842`	`+ if (!self._closed) {`
`843`	`843`	`self.destroyed = true;`
`844`	`844`	`self._closed = true;`
`845`	`845`	`self.emit('close');`