http: don't cork noop .end()

Calling .end() a second time should be a noop and not leave the socket corked. Fixes: #36620 PR-URL: #36633 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Danielle Adams <[email protected]>
nodejs · Jan 12, 2021 · 1b669b2 · 1b669b2
1 parent 2af43f6
commit 1b669b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -819,17 +819,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
     encoding = null;
   }
 
-  if (this.socket) {
-    this.socket.cork();
-  }
-
   if (chunk) {
     if (this.finished) {
       onError(this,
               new ERR_STREAM_WRITE_AFTER_END(),
               typeof callback !== 'function' ? nop : callback);
       return this;
     }
+
+    if (this.socket) {
+      this.socket.cork();
+    }
+
     write_(this, chunk, encoding, null, true);
   } else if (this.finished) {
     if (typeof callback === 'function') {
@@ -841,6 +842,10 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
     }
     return this;
   } else if (!this._header) {
+    if (this.socket) {
+      this.socket.cork();
+    }
+
     this._contentLength = 0;
     this._implicitHeader();
   }

diff --git a/test/parallel/test-http-outgoing-end-multiple.js b/test/parallel/test-http-outgoing-end-multiple.js
@@ -9,10 +9,13 @@ const onWriteAfterEndError = common.mustCall((err) => {
 
 const server = http.createServer(common.mustCall(function(req, res) {
   res.end('testing ended state', common.mustCall());
+  assert.strictEqual(res.writableCorked, 0);
   res.end(common.mustCall((err) => {
     assert.strictEqual(err.code, 'ERR_STREAM_ALREADY_FINISHED');
   }));
+  assert.strictEqual(res.writableCorked, 0);
   res.end('end', onWriteAfterEndError);
+  assert.strictEqual(res.writableCorked, 0);
   res.on('error', onWriteAfterEndError);
   res.on('finish', common.mustCall(() => {
     res.end(common.mustCall((err) => {