Skip to content

http2,tls: account for buffered data before creating socket wraps #34958

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

http2,tls: account for buffered data before creating socket wraps #34958

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6ca822
tls: account for buffered data before creating TLSSocket wrap
addaleax Aug 28, 2020
54fc9a1
http2: account for buffered data before creating HTTP2 socket wrap
addaleax Aug 28, 2020
52863d5
fixup! tls: account for buffered data before creating TLSSocket wrap
addaleax Aug 28, 2020
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
fixup! tls: account for buffered data before creating TLSSocket wrap
  • Loading branch information
@addaleax
addaleax committed Oct 6, 2020
commit 52863d56a12a01dd6155c3778ce15dc602c4ce68
5 changes: 3 additions & 2 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,9 @@ function TLSSocket(socket, opts) {
let wrap;
// Ideally, the readableLength check would not be necessary, and we would
// have a way to handle the buffered data at the C++ StreamBase level.
if (((socket instanceof net.Socket && socket._handle) || !socket) &&
socket.readableLength === 0) {
if ((socket instanceof net.Socket &&
socket._handle &&
socket.readableLength === 0) || !socket) {
// 1. connected socket
// 2. no socket, one will be created with net.Socket().connect
wrap = socket;
Expand Down