Skip to content

TLS cleanups #25861

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
sam-github wants to merge 6 commits into from
Closed

TLS cleanups #25861

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9381fd3
src: remove unused TLWrap::EnableTrace()
sam-github Jan 31, 2019
5ed7ad3
src: organize TLSWrap declarations by parent
sam-github Jan 31, 2019
25b6406
tls: don't shadow the tls global with a local
sam-github Jan 31, 2019
d295737
src: refactor SSLError case statement
sam-github Jan 31, 2019
40c838e
src: const_cast is necessary for 1.1.1, not 0.9.7
sam-github Jan 31, 2019
534379e
tls: in-line comments and other cleanups
sam-github Jan 31, 2019
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: don't shadow the tls global with a local 
`tls` shadows the global `tls` require, and isn't indicative of the
arument type.
  • Loading branch information
@sam-github
sam-github committed Feb 1, 2019
commit 25b6406403645329a561450946c9de9191dfd204
8 changes: 4 additions & 4 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,19 +273,19 @@ function onerror(err) {

// Used by both client and server TLSSockets to start data flowing from _handle,
// read(0) causes a StreamBase::ReadStart, via Socket._read.
function initRead(tls, socket) {
function initRead(tlsSocket, socket) {
// If we were destroyed already don't bother reading
if (!tls._handle)
if (!tlsSocket._handle)
return;

// Socket already has some buffered data - emulate receiving it
if (socket && socket.readableLength) {
var buf;
while ((buf = socket.read()) !== null)
tls._handle.receive(buf);
tlsSocket._handle.receive(buf);
}

tls.read(0);
tlsSocket.read(0);
}

/**
Expand Down