Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit595efd8

Browse files
trevnorrisaddaleax
authored andcommitted
Partial revert "tls: keep track of stream that is closed"
This partually reverts commit4cdb0e8.A nullptr check in TSLWrap::IsAlive() and the added test were left.PR-URL:#11947Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>Reviewed-By: James M Snell <jasnell@gmail.com>Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parentee463d3 commit595efd8

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

‎lib/_tls_wrap.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,12 +399,6 @@ TLSSocket.prototype._wrapHandle = function(wrap) {
399399
res=null;
400400
});
401401

402-
if(wrap){
403-
wrap.on('close',function(){
404-
res.onStreamClose();
405-
});
406-
}
407-
408402
returnres;
409403
};
410404

‎src/tls_wrap.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -815,14 +815,6 @@ void TLSWrap::EnableSessionCallbacks(
815815
}
816816

817817

818-
voidTLSWrap::OnStreamClose(const FunctionCallbackInfo<Value>& args) {
819-
TLSWrap* wrap;
820-
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
821-
822-
wrap->stream_ =nullptr;
823-
}
824-
825-
826818
voidTLSWrap::DestroySSL(const FunctionCallbackInfo<Value>& args) {
827819
TLSWrap* wrap;
828820
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
@@ -953,7 +945,6 @@ void TLSWrap::Initialize(Local<Object> target,
953945
env->SetProtoMethod(t,"enableSessionCallbacks", EnableSessionCallbacks);
954946
env->SetProtoMethod(t,"destroySSL", DestroySSL);
955947
env->SetProtoMethod(t,"enableCertCb", EnableCertCb);
956-
env->SetProtoMethod(t,"onStreamClose", OnStreamClose);
957948

958949
StreamBase::AddMethods<TLSWrap>(env, t, StreamBase::kFlagHasWritev);
959950
SSLWrap<TLSWrap>::AddMethods(env, t);

‎src/tls_wrap.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ class TLSWrap : public AsyncWrap,
161161
staticvoidEnableCertCb(
162162
const v8::FunctionCallbackInfo<v8::Value>& args);
163163
staticvoidDestroySSL(const v8::FunctionCallbackInfo<v8::Value>& args);
164-
staticvoidOnStreamClose(const v8::FunctionCallbackInfo<v8::Value>& args);
165164

166165
#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
167166
staticvoidGetServername(const v8::FunctionCallbackInfo<v8::Value>& args);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp