Skip to content

net: inline maybeDestroy() #27136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lpinca wants to merge 1 commit into from
Closed

net: inline maybeDestroy() #27136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
net: inline maybeDestroy() 
`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`.
  • Loading branch information
@lpinca
lpinca committed Apr 8, 2019
commit 767321c174e34f4d541d1c3d8dbf08c9e16403d7
14 changes: 2 additions & 12 deletions lib/net.js
View file
Open in desktop
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