Skip to content

v4.8.3 proposal #12499

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

Merged
MylesBorins merged 15 commits into from
May 2, 2017
Merged

v4.8.3 proposal #12499

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6d3aaa7
tls: TLSSocket emits 'error' on handshake failure
lekoder Sep 27, 2016
07b92a3
doc: add supported platforms list for v4.x
mhdawson Mar 17, 2017
1dc6b38
test: add test for loading from global folders
richardlau Oct 20, 2016
ba91c41
module: fix loading from global folders on Windows
richardlau Oct 25, 2016
99749dc
tls: keep track of stream that is closed
jBarz Mar 9, 2017
ff1d61c
stream_base,tls_wrap: notify on destruct
trevnorris Oct 31, 2016
4426080
Partial revert "tls: keep track of stream that is closed"
trevnorris Mar 20, 2017
54f5258
tls: fix segfault on destroy after partial read
bnoordhuis Mar 17, 2017
ab3fdf5
deps: cherry-pick ca0f9573 from V8 upstream
ofrobots Mar 20, 2017
8ed18a1
src: ensure that fd 0-2 are valid on windows
bzoz Mar 14, 2017
7a1920d
test: add hasCrypto check to tls-socket-close
danbev Mar 8, 2017
eb393f9
src: fix base64 decoding
seishun Mar 22, 2017
b5b78b1
src: add fcntl.h include to node.cc
bzoz Apr 20, 2017
6040efd
test: fix flaky test-tls-wrap-timeout
Trott Jul 23, 2016
788f280
2017-05-02, Version 4.8.3 'Argon' (Maintenance)
MylesBorins Apr 19, 2017
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
Partial revert "tls: keep track of stream that is closed" 
This partually reverts commit 4cdb0e8.

A nullptr check in TSLWrap::IsAlive() and the added test were left.

PR-URL: #11947
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
  • Loading branch information
@trevnorris @MylesBorins
trevnorris authored and MylesBorins committed Apr 19, 2017
commit 44260806a6fcbf554a9d60f5fd8acaeba071e26f
6 changes: 0 additions & 6 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,6 @@ TLSSocket.prototype._wrapHandle = function(wrap) {
res = null;
});

if (wrap) {
wrap.on('close', function() {
res.onStreamClose();
});
}

return res;
};

Expand Down
9 changes: 0 additions & 9 deletions src/tls_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,14 +790,6 @@ void TLSWrap::EnableSessionCallbacks(
}


void TLSWrap::OnStreamClose(const FunctionCallbackInfo<Value>& args) {
TLSWrap* wrap;
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());

wrap->stream_ = nullptr;
}


void TLSWrap::DestroySSL(const FunctionCallbackInfo<Value>& args) {
TLSWrap* wrap;
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
Expand Down Expand Up @@ -928,7 +920,6 @@ void TLSWrap::Initialize(Local<Object> target,
env->SetProtoMethod(t, "enableSessionCallbacks", EnableSessionCallbacks);
env->SetProtoMethod(t, "destroySSL", DestroySSL);
env->SetProtoMethod(t, "enableCertCb", EnableCertCb);
env->SetProtoMethod(t, "onStreamClose", OnStreamClose);

StreamBase::AddMethods<TLSWrap>(env, t, StreamBase::kFlagHasWritev);
SSLWrap<TLSWrap>::AddMethods(env, t);
Expand Down
1 change: 0 additions & 1 deletion src/tls_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ class TLSWrap : public AsyncWrap,
static void EnableCertCb(
const v8::FunctionCallbackInfo<v8::Value>& args);
static void DestroySSL(const v8::FunctionCallbackInfo<v8::Value>& args);
static void OnStreamClose(const v8::FunctionCallbackInfo<v8::Value>& args);

#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
static void GetServername(const v8::FunctionCallbackInfo<v8::Value>& args);
Expand Down