Skip to content

Commit

Permalink
net: inline maybeDestroy()
Browse files Browse the repository at this point in the history
`maybeDestroy()` is only called from the listener of the `'end'` event.
That event is only emitted after the socket is connected (after `UV_EOF`
is read) and after `socket.readable` is set to `false`.

PR-URL: nodejs#27136
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
lpinca committed Apr 11, 2019
1 parent 29d0b43 commit 655c90b
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -541,19 +541,9 @@ function onReadableStreamEnd() {
if (this.writable)
this.end();
}
maybeDestroy(this);
}


// Call whenever we set writable=false or readable=false
function maybeDestroy(socket) {
if (!socket.readable &&
!socket.writable &&
!socket.destroyed &&
!socket.connecting &&
!socket.writableLength) {
socket.destroy();
}
if (!this.destroyed && !this.writable && !this.writableLength)
this.destroy();
}


Expand Down

0 comments on commit 655c90b

Please sign in to comment.