From a65f0756a16f09d458df1dd6b83f947617182ec1 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Fri, 7 Jun 2019 14:20:43 +0200
Subject: [PATCH] http: fix test where aborted should not be emitted

---
 doc/api/http.md                               |  5 ++--
 lib/_http_client.js                           | 16 +++++++++----
 test/parallel/test-http-client-aborted.js     | 23 +++++++++++++++++++
 ...test-http-client-no-error-after-aborted.js | 21 +++++++++++++++++
 .../test-http-client-timeout-on-connect.js    |  3 +--
 .../test-http-writable-true-after-close.js    |  2 +-
 6 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 test/parallel/test-http-client-aborted.js
 create mode 100644 test/parallel/test-http-client-no-error-after-aborted.js

diff --git a/doc/api/http.md b/doc/api/http.md
index 0588d7f408f194..f8453830f0c00d 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -537,7 +537,8 @@ added: v0.3.8
 -->
 
 Marks the request as aborting. Calling this will cause remaining data
-in the response to be dropped and the socket to be destroyed.
+in the response to be dropped and the socket to be destroyed. After
+calling this method no further errors will be emitted.
 
 ### request.aborted
 <!-- YAML
@@ -2138,8 +2139,6 @@ will be emitted in the following order:
 * `'socket'`
 * (`req.abort()` called here)
 * `'abort'`
-* `'error'` with an error with message `'Error: socket hang up'` and code
-  `'ECONNRESET'`
 * `'close'`
 
 If `req.abort()` is called after the response is received, the following events
diff --git a/lib/_http_client.js b/lib/_http_client.js
index 5555db13623553..4ca4d497ed5c68 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -373,7 +373,9 @@ function socketCloseListener() {
       // receive a response. The error needs to
       // fire on the request.
       req.socket._hadError = true;
-      req.emit('error', connResetException('socket hang up'));
+      if (!req.aborted) {
+        req.emit('error', connResetException('socket hang up'));
+      }
     }
     req.emit('close');
   }
@@ -399,7 +401,9 @@ function socketErrorListener(err) {
     // For Safety. Some additional errors might fire later on
     // and we need to make sure we don't double-fire the error event.
     req.socket._hadError = true;
-    req.emit('error', err);
+    if (!req.aborted) {
+      req.emit('error', err);
+    }
   }
 
   // Handle any pending data
@@ -433,7 +437,9 @@ function socketOnEnd() {
     // If we don't have a response then we know that the socket
     // ended prematurely and we need to emit an error on the request.
     req.socket._hadError = true;
-    req.emit('error', connResetException('socket hang up'));
+    if (!req.aborted) {
+      req.emit('error', connResetException('socket hang up'));
+    }
   }
   if (parser) {
     parser.finish();
@@ -455,7 +461,9 @@ function socketOnData(d) {
     freeParser(parser, req, socket);
     socket.destroy();
     req.socket._hadError = true;
-    req.emit('error', ret);
+    if (!req.aborted) {
+      req.emit('error', ret);
+    }
   } else if (parser.incoming && parser.incoming.upgrade) {
     // Upgrade (if status code 101) or CONNECT
     var bytesParsed = ret;
diff --git a/test/parallel/test-http-client-aborted.js b/test/parallel/test-http-client-aborted.js
new file mode 100644
index 00000000000000..58e8d589c79dc0
--- /dev/null
+++ b/test/parallel/test-http-client-aborted.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const common = require('../common');
+const http = require('http');
+const assert = require('assert');
+
+const server = http.createServer(common.mustCall(function(req, res) {
+  req.on('aborted', common.mustCall(function() {
+    assert.strictEqual(this.aborted, true);
+    server.close();
+  }));
+  assert.strictEqual(req.aborted, false);
+  res.write('hello');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const req = http.get({
+    port: server.address().port,
+    headers: { connection: 'keep-alive' }
+  }, common.mustCall((res) => {
+    req.abort();
+  }));
+}));
diff --git a/test/parallel/test-http-client-no-error-after-aborted.js b/test/parallel/test-http-client-no-error-after-aborted.js
new file mode 100644
index 00000000000000..21f72008a93441
--- /dev/null
+++ b/test/parallel/test-http-client-no-error-after-aborted.js
@@ -0,0 +1,21 @@
+'use strict';
+
+const common = require('../common');
+const http = require('http');
+
+const server = http.createServer(common.mustCall((req, res) => {
+  res.write('hello');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const req = http.get({
+    port: server.address().port
+  }, common.mustCall((res) => {
+    req.on('error', common.mustNotCall());
+    req.abort();
+    req.socket.destroy(new Error());
+    req.on('close', common.mustCall(() => {
+      server.close();
+    }));
+  }));
+}));
diff --git a/test/parallel/test-http-client-timeout-on-connect.js b/test/parallel/test-http-client-timeout-on-connect.js
index 3a0098229d9af8..d2c6975e2578c0 100644
--- a/test/parallel/test-http-client-timeout-on-connect.js
+++ b/test/parallel/test-http-client-timeout-on-connect.js
@@ -23,8 +23,7 @@ server.listen(0, common.localhostIPv4, common.mustCall(() => {
     }));
   }));
   req.on('timeout', common.mustCall(() => req.abort()));
-  req.on('error', common.mustCall((err) => {
-    assert.strictEqual(err.message, 'socket hang up');
+  req.on('abort', common.mustCall(() => {
     server.close();
   }));
 }));
diff --git a/test/parallel/test-http-writable-true-after-close.js b/test/parallel/test-http-writable-true-after-close.js
index c0db7c34492762..1174eec2ec1ac7 100644
--- a/test/parallel/test-http-writable-true-after-close.js
+++ b/test/parallel/test-http-writable-true-after-close.js
@@ -34,7 +34,7 @@ const server = createServer(common.mustCall((req, res) => {
     }));
   }).listen(0, () => {
     external = get(`http://127.0.0.1:${server.address().port}`);
-    external.on('error', common.mustCall(() => {
+    external.on('abort', common.mustCall(() => {
       server.close();
       internal.close();
     }));