Skip to content

Commit

Permalink
Revert "net: add support for finished after .destroy()"
Browse files Browse the repository at this point in the history
This reverts commit 2da3611.

PR-URL: #37964
Refs: #37937
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
mcollina authored and lpinca committed Mar 31, 2021
1 parent 3dee233 commit 2fa7d33
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 48 deletions.
8 changes: 6 additions & 2 deletions lib/_http_incoming.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 1 addition & 9 deletions lib/internal/streams/end-of-stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand Down Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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');
}

Expand Down
25 changes: 0 additions & 25 deletions test/parallel/test-net-finished.js

This file was deleted.

0 comments on commit 2fa7d33

Please sign in to comment.