Revert "net: add support for finished after .destroy()"

This reverts commit 2da3611. PR-URL: #37964 Refs: #37937 Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Mar 31, 2021 · 2fa7d33 · 2fa7d33
1 parent 3dee233
commit 2fa7d33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 48 deletions.
diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
@@ -181,8 +181,12 @@ IncomingMessage.prototype._destroy = function _destroy(err, cb) {
     this.emit('aborted');
   }
 
-  // If aborted destroy socket.
-  if (this.socket && this.aborted) {
+  // If aborted and the underlying socket is not already destroyed,
+  // destroy it.
+  // We have to check if the socket is already destroyed because finished
+  // does not call the callback when this methdod is invoked from `_http_client`
+  // in `test/parallel/test-http-client-spurious-aborted.js`
+  if (this.socket && !this.socket.destroyed && this.aborted) {
     this.socket.destroy(err);
     const cleanup = finished(this.socket, (e) => {
       cleanup();

diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -22,14 +22,6 @@ const {
   validateObject,
 } = require('internal/validators');
 
-function isSocket(stream) {
-  return (
-    typeof stream.connect === 'function' &&
-    typeof stream.setNoDelay === 'function' &&
-    typeof stream.setKeepAlive === 'function'
-  );
-}
-
 function isRequest(stream) {
   return stream.setHeader && typeof stream.abort === 'function';
 }
@@ -105,7 +97,7 @@ function eos(stream, options, callback) {
   let willEmitClose = isServerResponse(stream) || (
     state &&
     state.autoDestroy &&
-    (state.emitClose || isSocket(stream)) &&
+    state.emitClose &&
     state.closed === false &&
     isReadable(stream) === readable &&
     isWritable(stream) === writable

diff --git a/lib/net.js b/lib/net.js
@@ -662,12 +662,6 @@ Socket.prototype._destroy = function(exception, cb) {
 
     this._handle.close(() => {
       debug('emit close');
-      if (this._writableState) {
-        this._writableState.closed = true;
-      }
-      if (this._readableState) {
-        this._readableState.closed = true;
-      }
       this.emit('close', isException);
     });
     this._handle.onread = noop;
@@ -1655,12 +1649,6 @@ Server.prototype._emitCloseIfDrained = function() {
 
 function emitCloseNT(self) {
   debug('SERVER: emit close');
-  if (self._writableState) {
-    self._writableState.closed = true;
-  }
-  if (self._readableState) {
-    self._readableState.closed = true;
-  }
   self.emit('close');
 }
 

diff --git a/test/parallel/test-net-finished.js b/test/parallel/test-net-finished.js