Skip to content

tls,net: fix shutdown issue more cleanly #24290

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
addaleax wants to merge 3 commits into from
Closed

tls,net: fix shutdown issue more cleanly #24290

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbac8e8
tls: do not rely on 'drain' handlers in StreamWrap
addaleax Nov 10, 2018
c58bced
tls: destroy TLS socket if StreamWrap is destroyed
addaleax Nov 10, 2018
4cae5b8
Revert "net: partially revert "simplify Socket.prototype._final""
addaleax Nov 10, 2018
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
Prev Previous commit
Next Next commit
tls: destroy TLS socket if StreamWrap is destroyed 
Previously, there was no mechanism in place that would
have destroyed the TLS socket once the underlying socket
had been closed.
  • Loading branch information
@addaleax
addaleax committed Nov 10, 2018
commit c58bced696227902a182de88b128963eb600c108
6 changes: 4 additions & 2 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,12 @@ function TLSSocket(socket, opts) {

// Wrap plain JS Stream into StreamWrap
var wrap;
if ((socket instanceof net.Socket && socket._handle) || !socket)
if ((socket instanceof net.Socket && socket._handle) || !socket) {
wrap = socket;
else
} else {
wrap = new StreamWrap(socket);
wrap.once('close', () => this.destroy());
Comment thread
oyyd marked this conversation as resolved.
}

// Just a documented property to make secure sockets
// distinguishable from regular ones.
Expand Down