http: cleanup cork logic

lib/_http_outgoing.js

@@ -88,6 +88,7 @@ const kUniqueHeaders = Symbol('kUniqueHeaders');
 const kBytesWritten = Symbol('kBytesWritten');
 const kEndCalled = Symbol('kEndCalled');
 const kErrored = Symbol('errored');
+const kSocket = Symbol('kSocket');
 
 const nop = () => {};
 
@@ -188,22 +189,21 @@ ObjectDefineProperty(OutgoingMessage.prototype, 'writableObjectMode', {
 ObjectDefineProperty(OutgoingMessage.prototype, 'writableLength', {
   __proto__: null,
   get() {
-    return this.outputSize + (this.socket ? this.socket.writableLength : 0);
+    return this.outputSize + (this[kSocket] ? this[kSocket].writableLength : 0);
   }
 });
 
 ObjectDefineProperty(OutgoingMessage.prototype, 'writableHighWaterMark', {
   __proto__: null,
   get() {
-    return this.socket ? this.socket.writableHighWaterMark : HIGH_WATER_MARK;
+    return this[kSocket] ? this[kSocket].writableHighWaterMark : HIGH_WATER_MARK;
   }
 });
 
 ObjectDefineProperty(OutgoingMessage.prototype, 'writableCorked', {
   __proto__: null,
   get() {
-    const corked = this.socket ? this.socket.writableCorked : 0;
-    return corked + this[kCorked];
+    return this[kSocket] ? this[kSocket].writableCorked : this[kCorked];
   }
 });
 
@@ -238,6 +238,20 @@ ObjectDefineProperty(OutgoingMessage.prototype, 'connection', {
   }
 });
 
+ObjectDefineProperty(OutgoingMessage.prototype, 'socket', {
+  __proto__: null,
+  get: function() {
+    return this[kSocket];
+  },
+  set: function(val) {
+    for (let n = 0; n < this[kCorked]; n++) {
+      val?.cork();
+    }
+    this[kCorked] = 0;
+    this[kSocket] = val;
+  }
+});
+
 ObjectDefineProperty(OutgoingMessage.prototype, '_headerNames', {
   __proto__: null,
   get: internalUtil.deprecate(function() {
@@ -915,9 +929,9 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
     return true;
   }
 
-  if (!fromEnd && msg.socket && !msg.socket.writableCorked) {
-    msg.socket.cork();
-    process.nextTick(connectionCorkNT, msg.socket);
+  if (!fromEnd && !msg.writableCorked) {
+    msg.cork();
+    process.nextTick(connectionUncorkNT, msg);
   }
 
   let ret;
@@ -935,8 +949,8 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
 }
 
 
-function connectionCorkNT(conn) {
-  conn.uncork();
+function connectionUncorkNT(msg) {
+  msg.uncork();
 }
 
 OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
@@ -1049,8 +1063,9 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
     // Fully uncork connection on end().
     this.socket._writableState.corked = 1;
     this.socket.uncork();
+  } else {
+    this[kCorked] = 0;
   }
-  this[kCorked] = 0;
 
   this.finished = true;
 
@@ -1112,11 +1127,6 @@ OutgoingMessage.prototype._flush = function _flush() {
 };
 
 OutgoingMessage.prototype._flushOutput = function _flushOutput(socket) {
-  while (this[kCorked]) {
-    this[kCorked]--;
-    socket.cork();
-  }
-
   const outputLength = this.outputData.length;
   if (outputLength <= 0)
     return undefined;