http: don't emit 'finish' after 'error'

ronag · targos · commit cf47bb981845 · 2020-04-22T18:17:23.000+02:00
PR-URL: #32276 Refs: #28710 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -727,6 +727,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
 };
 
 function onFinish(outmsg) {
+  if (outmsg && outmsg.socket && outmsg.socket._hadError) return;
   outmsg.emit('finish');
 }
 
diff --git a/test/parallel/test-tls-set-secure-context.js b/test/parallel/test-tls-set-secure-context.js
@@ -82,6 +82,7 @@ function makeRequest(port, id) {
       headers: { id }
     };
 
+    let errored = false;
     https.get(`https://localhost:${port}`, options, (res) => {
       let response = '';
 
@@ -95,7 +96,10 @@ function makeRequest(port, id) {
         resolve(response);
       }));
     }).on('error', (err) => {
+      errored = true;
       reject(err);
+    }).on('finish', () => {
+      assert.strictEqual(errored, false);
     });
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -727,6 +727,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {`
`727`	`727`	`};`
`728`	`728`
`729`	`729`	`function onFinish(outmsg) {`
	`730`	`+ if (outmsg && outmsg.socket && outmsg.socket._hadError) return;`
`730`	`731`	`outmsg.emit('finish');`
`731`	`732`	`}`
`732`	`733`