From 4dc7ac6a4589e022f944b539484a5bd7ac2be5e6 Mon Sep 17 00:00:00 2001
From: wenningplus <zhangwenning@videopls.com>
Date: Tue, 9 Jun 2020 13:42:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?http:ClientRequest=20return=20host=E3=80=81?=
 =?UTF-8?q?protocol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/api/http.md                               | 21 ++++++++++++++++
 lib/_http_client.js                           |  2 ++
 .../parallel/test-http-outgoing-properties.js | 25 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/doc/api/http.md b/doc/api/http.md
index 8d858ba8248334..d14bdbdae2a3ba 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -744,6 +744,27 @@ added: v0.4.0
 
 * {string} The request path.
 
+### `request.method`
+<!-- YAML
+added: v0.4.0
+-->
+
+* {string} The request method.
+
+### `request.host`
+<!-- YAML
+added: v0.4.0
+-->
+
+* {string} The request host.
+
+### `request.protocol`
+<!-- YAML
+added: v0.4.0
+-->
+
+* {string} The request protocol.
+
 ### `request.removeHeader(name)`
 <!-- YAML
 added: v1.6.0
diff --git a/lib/_http_client.js b/lib/_http_client.js
index 3093047bd731f2..7163f2bfaa11d1 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -221,6 +221,8 @@ function ClientRequest(input, options, cb) {
   this.parser = null;
   this.maxHeadersCount = null;
   this.reusedSocket = false;
+  this.host = host;
+  this.protocol = protocol;
 
   let called = false;
 
diff --git a/test/parallel/test-http-outgoing-properties.js b/test/parallel/test-http-outgoing-properties.js
index 3bb6c637bf004d..2a29a288d925c9 100644
--- a/test/parallel/test-http-outgoing-properties.js
+++ b/test/parallel/test-http-outgoing-properties.js
@@ -51,3 +51,28 @@ const OutgoingMessage = http.OutgoingMessage;
   msg.write('asd');
   assert.strictEqual(msg.writableLength, 7);
 }
+
+{
+  const server = http.createServer(function(req, res) {
+    res.end();
+    res.on('finish', () => {
+      server.close();
+    });
+  });
+
+  server.listen(0);
+
+  server.on('listening', function() {
+    const req = http.request({
+      port: server.address().port,
+      method: 'GET',
+      path: '/'
+    });
+
+    assert.strictEqual(req.path, '/');
+    assert.strictEqual(req.method, 'GET');
+    assert.strictEqual(req.host, 'localhost');
+    assert.strictEqual(req.protocol, 'http:');
+    req.end();
+  });
+}

From 6d96e24102e9c9a09022cb4a52336d5066943ece Mon Sep 17 00:00:00 2001
From: wenningplus <zhangwenning@videopls.com>
Date: Tue, 9 Jun 2020 16:20:57 +0800
Subject: [PATCH 2/7] modify http.md

---
 doc/api/http.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index d14bdbdae2a3ba..39cc40288f416b 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -746,21 +746,33 @@ added: v0.4.0
 
 ### `request.method`
 <!-- YAML
-added: v0.4.0
+added: REPLACEME
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/33803
+    description: add request.method to doc.
 -->
 
 * {string} The request method.
 
 ### `request.host`
 <!-- YAML
-added: v0.4.0
+added: REPLACEME
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/33803
+    description: exposed host property.
 -->
 
 * {string} The request host.
 
 ### `request.protocol`
 <!-- YAML
-added: v0.4.0
+added: REPLACEME
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/33803
+    description: exposed protocol property.
 -->
 
 * {string} The request protocol.

From ce83a1a287ed683eea3b2971a08f48c6739dfefb Mon Sep 17 00:00:00 2001
From: wenningplus <zhangwenning@videopls.com>
Date: Tue, 9 Jun 2020 23:45:50 +0800
Subject: [PATCH 3/7] update doc format and modify test unit

---
 doc/api/http.md                                | 6 +-----
 test/parallel/test-http-outgoing-properties.js | 8 +++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index 39cc40288f416b..7b337bb4611ed8 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -746,11 +746,7 @@ added: v0.4.0
 
 ### `request.method`
 <!-- YAML
-added: REPLACEME
-changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/33803
-    description: add request.method to doc.
+added: v14.4.0
 -->
 
 * {string} The request method.
diff --git a/test/parallel/test-http-outgoing-properties.js b/test/parallel/test-http-outgoing-properties.js
index 2a29a288d925c9..17348090aa41cd 100644
--- a/test/parallel/test-http-outgoing-properties.js
+++ b/test/parallel/test-http-outgoing-properties.js
@@ -55,14 +55,12 @@ const OutgoingMessage = http.OutgoingMessage;
 {
   const server = http.createServer(function(req, res) {
     res.end();
-    res.on('finish', () => {
-      server.close();
-    });
+    server.close();
   });
 
   server.listen(0);
 
-  server.on('listening', function() {
+  server.on('listening', common.mustCall(function() {
     const req = http.request({
       port: server.address().port,
       method: 'GET',
@@ -74,5 +72,5 @@ const OutgoingMessage = http.OutgoingMessage;
     assert.strictEqual(req.host, 'localhost');
     assert.strictEqual(req.protocol, 'http:');
     req.end();
-  });
+  }));
 }

From 52500aef703d8e5d1c582673fedb350e461d1e0b Mon Sep 17 00:00:00 2001
From: wenningplus <zhangwenning@videopls.com>
Date: Wed, 10 Jun 2020 07:56:38 +0800
Subject: [PATCH 4/7] modify request.method version

---
 doc/api/http.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index 7b337bb4611ed8..aeaf834ee06313 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -746,7 +746,7 @@ added: v0.4.0
 
 ### `request.method`
 <!-- YAML
-added: v14.4.0
+added: v0.1.97
 -->
 
 * {string} The request method.

From df6fcfea2237d4ce6a40fc1e11d73708ebd81365 Mon Sep 17 00:00:00 2001
From: wenningplus <zhangwenning@videopls.com>
Date: Wed, 10 Jun 2020 11:04:13 +0800
Subject: [PATCH 5/7] remote changes section

---
 doc/api/http.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index aeaf834ee06313..d4987e13494471 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -754,10 +754,6 @@ added: v0.1.97
 ### `request.host`
 <!-- YAML
 added: REPLACEME
-changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/33803
-    description: exposed host property.
 -->
 
 * {string} The request host.
@@ -765,10 +761,6 @@ changes:
 ### `request.protocol`
 <!-- YAML
 added: REPLACEME
-changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/33803
-    description: exposed protocol property.
 -->
 
 * {string} The request protocol.

From 62cc2aff1790164d3d194186d4c9c0e94ed17b9c Mon Sep 17 00:00:00 2001
From: zhangwinning <zhangwenning@videopls.com>
Date: Mon, 22 Jun 2020 08:51:00 +0800
Subject: [PATCH 6/7] Update test/parallel/test-http-outgoing-properties.js

Co-authored-by: mscdex <mscdex@users.noreply.github.com>
---
 test/parallel/test-http-outgoing-properties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-http-outgoing-properties.js b/test/parallel/test-http-outgoing-properties.js
index 17348090aa41cd..1019c736ccc975 100644
--- a/test/parallel/test-http-outgoing-properties.js
+++ b/test/parallel/test-http-outgoing-properties.js
@@ -53,7 +53,7 @@ const OutgoingMessage = http.OutgoingMessage;
 }
 
 {
-  const server = http.createServer(function(req, res) {
+  const server = http.createServer((req, res) => {
     res.end();
     server.close();
   });

From be3c4b1579c2a3cb6fa41d5533785221c3a46f7b Mon Sep 17 00:00:00 2001
From: zhangwinning <zhangwenning@videopls.com>
Date: Mon, 22 Jun 2020 08:51:24 +0800
Subject: [PATCH 7/7] Update test/parallel/test-http-outgoing-properties.js

Co-authored-by: mscdex <mscdex@users.noreply.github.com>
---
 test/parallel/test-http-outgoing-properties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-http-outgoing-properties.js b/test/parallel/test-http-outgoing-properties.js
index 1019c736ccc975..ec25546c4b66ec 100644
--- a/test/parallel/test-http-outgoing-properties.js
+++ b/test/parallel/test-http-outgoing-properties.js
@@ -60,7 +60,7 @@ const OutgoingMessage = http.OutgoingMessage;
 
   server.listen(0);
 
-  server.on('listening', common.mustCall(function() {
+  server.on('listening', common.mustCall(() => {
     const req = http.request({
       port: server.address().port,
       method: 'GET',