stream: finished on closed OutgoingMessage

finished should invoke callback on closed OutgoingMessage the same way as for regular streams. Fixes: #34301
nodejs · Jul 12, 2020 · cd753c4 · cd753c4
1 parent 4e3f6f3
commit cd753c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -7,6 +7,7 @@ const {
   ERR_INVALID_ARG_TYPE,
   ERR_STREAM_PREMATURE_CLOSE
 } = require('internal/errors').codes;
+const { kClosed } = require('internal/http');
 const { once } = require('internal/util');
 
 function isRequest(stream) {
@@ -147,7 +148,7 @@ function eos(stream, opts, callback) {
   if (opts.error !== false) stream.on('error', onerror);
   stream.on('close', onclose);
 
-  const closed = (
+  const closed = stream[kClosed] === true || (
     (wState && wState.closed) ||
     (rState && rState.closed) ||
     (wState && wState.errorEmitted) ||

diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
@@ -13,6 +13,7 @@ const assert = require('assert');
 const EE = require('events');
 const fs = require('fs');
 const { promisify } = require('util');
+const http = require('http');
 
 {
   const rs = new Readable({
@@ -480,3 +481,21 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
     finished(p, common.mustNotCall());
   }));
 }
+
+{
+  const server = http.createServer((req, res) => {
+    res.on('close', () => {
+      finished(res, common.mustCall(() => {
+        server.close();
+      }));
+    });
+    res.end();
+  })
+  .listen(0, function() {
+    http.request({
+      method: 'GET',
+      port: this.address().port
+    }).end()
+      .on('response', common.mustCall());
+  });
+}