Partial revert "tls: keep track of stream that is closed" · nodejs/node@51c8d80 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 592
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 51c8d80

Browse filesBrowse the repository at this point in the historyBrowse files

trevnorris

authored and

MylesBorins

committed

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 <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>

1 parent 4051184 commit 51c8d80
Copy full SHA for 51c8d80

3 files changed

-16Lines changed: 0 additions & 16 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • _tls_wrap.js
• src
  • tls_wrap.cc
  • tls_wrap.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/_tls_wrap.js‎

Copy file name to clipboardExpand all lines: lib/_tls_wrap.js

-6Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -378,12 +378,6 @@ TLSSocket.prototype._wrapHandle = function(wrap) {
378	378	res = null;
379	379	});
380	380
381		- if (wrap) {
382		- wrap.on('close', function() {
383		- res.onStreamClose();
384		- });
385		- }
386		-
387	381	return res;
388	382	};
389	383

Collapse file

‎src/tls_wrap.cc‎

Copy file name to clipboardExpand all lines: src/tls_wrap.cc

-9Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
@@ -794,14 +794,6 @@ void TLSWrap::EnableSessionCallbacks(
794	794	}
795	795
796	796
797		- void TLSWrap::OnStreamClose(const FunctionCallbackInfo<Value>& args) {
798		- TLSWrap* wrap;
799		- ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
800		-
801		- wrap->stream_ = nullptr;
802		- }
803		-
804		-
805	797	void TLSWrap::DestroySSL(const FunctionCallbackInfo<Value>& args) {
806	798	TLSWrap* wrap;
807	799	ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
@@ -932,7 +924,6 @@ void TLSWrap::Initialize(Local<Object> target,
932	924	env->SetProtoMethod(t, "enableSessionCallbacks", EnableSessionCallbacks);
933	925	env->SetProtoMethod(t, "destroySSL", DestroySSL);
934	926	env->SetProtoMethod(t, "enableCertCb", EnableCertCb);
935		- env->SetProtoMethod(t, "onStreamClose", OnStreamClose);
936	927
937	928	StreamBase::AddMethods<TLSWrap>(env, t, StreamBase::kFlagHasWritev);
938	929	SSLWrap<TLSWrap>::AddMethods(env, t);

Collapse file

‎src/tls_wrap.h‎

Copy file name to clipboardExpand all lines: src/tls_wrap.h

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -140,7 +140,6 @@ class TLSWrap : public AsyncWrap,
140	140	static void EnableCertCb(
141	141	const v8::FunctionCallbackInfo<v8::Value>& args);
142	142	static void DestroySSL(const v8::FunctionCallbackInfo<v8::Value>& args);
143		- static void OnStreamClose(const v8::FunctionCallbackInfo<v8::Value>& args);
144	143
145	144	#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
146	145	static void GetServername(const v8::FunctionCallbackInfo<v8::Value>& args);

0 commit comments

Comments

0 (0)