summaryrefslogtreecommitdiff
path: root/src/tls_wrap.cc
diff options
context:
space:
mode:
authorTrevor Norris <trev.norris@gmail.com>2017-03-20 16:26:10 -0600
committerAnna Henningsen <anna@addaleax.net>2017-03-27 02:21:39 +0200
commit595efd8b9a463886c20fb04103c508bd9c3630e7 (patch)
tree4f978e7ee7ed6b8f075166c9a156e53f9c9c3ccc /src/tls_wrap.cc
parentee463d335e05a6656001697152ee7ec056eb209b (diff)
downloadandroid-node-v8-595efd8b9a463886c20fb04103c508bd9c3630e7.tar.gz
android-node-v8-595efd8b9a463886c20fb04103c508bd9c3630e7.tar.bz2
android-node-v8-595efd8b9a463886c20fb04103c508bd9c3630e7.zip
Partial revert "tls: keep track of stream that is closed"
This partually reverts commit 4cdb0e89d8daf7e1371c3b8d3f057940aa327d4a. A nullptr check in TSLWrap::IsAlive() and the added test were left. PR-URL: https://github.com/nodejs/node/pull/11947 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'src/tls_wrap.cc')
-rw-r--r--src/tls_wrap.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 3dad65011f..6f2d0e4c16 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -815,14 +815,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());
@@ -953,7 +945,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);