From 0daec61b9bdefbde1026f0dacb7ee38eb6a91771 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Tue, 6 Aug 2019 13:56:52 +0200
Subject: http: replace superfluous connection property with getter/setter

PR-URL: https://github.com/nodejs/node/pull/29015
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 lib/_http_outgoing.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'lib/_http_outgoing.js')

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index 2d2bbaa0e7..c56c6e4798 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -102,7 +102,6 @@ function OutgoingMessage() {
   this[kIsCorked] = false;
 
   this.socket = null;
-  this.connection = null;
   this._header = null;
   this[kOutHeaders] = null;
 
@@ -157,6 +156,15 @@ Object.defineProperty(OutgoingMessage.prototype, '_headers', {
   }, 'OutgoingMessage.prototype._headers is deprecated', 'DEP0066')
 });
 
+Object.defineProperty(OutgoingMessage.prototype, 'connection', {
+  get: function() {
+    return this.socket;
+  },
+  set: function(val) {
+    this.socket = val;
+  }
+});
+
 Object.defineProperty(OutgoingMessage.prototype, '_headerNames', {
   get: internalUtil.deprecate(function() {
     const headers = this[kOutHeaders];
@@ -273,7 +281,7 @@ OutgoingMessage.prototype._send = function _send(data, encoding, callback) {
 
 OutgoingMessage.prototype._writeRaw = _writeRaw;
 function _writeRaw(data, encoding, callback) {
-  const conn = this.connection;
+  const conn = this.socket;
   if (conn && conn.destroyed) {
     // The socket was destroyed. If we're still trying to write to it,
     // then we haven't gotten the 'close' event yet.
@@ -615,10 +623,10 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
                                    ['string', 'Buffer'], chunk);
   }
 
-  if (!fromEnd && msg.connection && !msg[kIsCorked]) {
-    msg.connection.cork();
+  if (!fromEnd && msg.socket && !msg[kIsCorked]) {
+    msg.socket.cork();
     msg[kIsCorked] = true;
-    process.nextTick(connectionCorkNT, msg, msg.connection);
+    process.nextTick(connectionCorkNT, msg, msg.socket);
   }
 
   var len, ret;
@@ -706,8 +714,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
       else
         this._contentLength = chunk.length;
     }
-    if (this.connection) {
-      this.connection.cork();
+    if (this.socket) {
+      this.socket.cork();
       uncork = true;
     }
     write_(this, chunk, encoding, null, true);
@@ -729,7 +737,7 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
   }
 
   if (uncork)
-    this.connection.uncork();
+    this.socket.uncork();
 
   this.finished = true;
 
@@ -737,8 +745,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
   // everything to the socket.
   debug('outgoing message end.');
   if (this.outputData.length === 0 &&
-      this.connection &&
-      this.connection._httpMessage === this) {
+      this.socket &&
+      this.socket._httpMessage === this) {
     this._finish();
   }
 
@@ -747,7 +755,7 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
 
 
 OutgoingMessage.prototype._finish = function _finish() {
-  assert(this.connection);
+  assert(this.socket);
   this.emit('prefinish');
 };
 
-- 
cgit v1.2.3