Skip to content

Ingela/dist ssl/otp 20156 #11181

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

Open
IngelaAndin wants to merge 2 commits into
base: maint
Choose a base branch
from
+10 −9
Open

Ingela/dist ssl/otp 20156 #11181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0542ac7
Updated OTP version
May 26, 2026
0753448
ssl: Handle dist opt file correctly
IngelaAndin Jun 3, 2026
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
2 changes: 1 addition & 1 deletion OTP_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
29.0
29.0.1
16 changes: 8 additions & 8 deletions lib/ssl/src/ssl_dist_sup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
%%%=========================================================================

-spec start_link() -> {ok, pid()} | ignore | {error, term()}.

start_link() ->
case init:get_argument(ssl_dist_optfile) of
{ok, [File]} ->
{ok, [[File]]} ->
DistOpts = consult(File),
TabOpts = [set, protected, named_table],
Tab = ets:new(ssl_dist_opts, TabOpts),
Expand All @@ -60,13 +60,13 @@ start_link() ->
%%% Supervisor callback
%%%=========================================================================

init([]) ->
SupFlags = #{strategy => one_for_all,
init([]) ->
SupFlags = #{strategy => one_for_all,
intensity => 10,
period => 3600
},
ChildSpecs = [ssl_admin_child_spec(),
ssl_connection_sup()],
ssl_connection_sup()],
{ok, {SupFlags, ChildSpecs}}.

%%--------------------------------------------------------------------
Expand All @@ -75,16 +75,16 @@ init([]) ->
ssl_admin_child_spec() ->
#{id => ssl_dist_admin_sup,
start => {ssl_dist_admin_sup, start_link , []},
restart => permanent,
restart => permanent,
shutdown => 4000,
modules => [ssl_dist_admin_sup],
type => supervisor
}.

ssl_connection_sup() ->
#{id => tls_dist_sup,
start => {tls_dist_sup, start_link, []},
restart => permanent,
restart => permanent,
shutdown => 4000,
modules => [tls_dist_sup],
type => supervisor
Expand Down
1 change: 1 addition & 0 deletions otp_versions.table
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
OTP-29.0.1 : compiler-10.0.1 erts-17.0.1 kernel-11.0.1 public_key-1.21.1 snmp-5.20.4 ssl-11.7.1 # asn1-5.5 common_test-1.31 crypto-5.9 debugger-7.0 dialyzer-6.0 diameter-2.7 edoc-1.5 eldap-1.3 erl_interface-5.8 et-1.8 eunit-2.11 ftp-1.2.5 inets-9.7 jinterface-1.16 megaco-4.9 mnesia-4.26 observer-2.19 odbc-2.17 os_mon-2.12 parsetools-2.8 reltool-1.1 runtime_tools-2.4 sasl-4.4 ssh-6.0 stdlib-8.0 syntax_tools-4.1 tftp-1.3 tools-4.2 wx-2.6 xmerl-2.2 :
OTP-29.0 : asn1-5.5 common_test-1.31 compiler-10.0 crypto-5.9 debugger-7.0 dialyzer-6.0 diameter-2.7 edoc-1.5 eldap-1.3 erl_interface-5.8 erts-17.0 et-1.8 eunit-2.11 ftp-1.2.5 inets-9.7 jinterface-1.16 kernel-11.0 megaco-4.9 mnesia-4.26 observer-2.19 odbc-2.17 os_mon-2.12 parsetools-2.8 public_key-1.21 reltool-1.1 runtime_tools-2.4 sasl-4.4 snmp-5.20.3 ssh-6.0 ssl-11.7 stdlib-8.0 syntax_tools-4.1 tftp-1.3 tools-4.2 wx-2.6 xmerl-2.2 # :
OTP-28.5 : erl_interface-5.7 erts-16.4 mnesia-4.25.3 ssl-11.6 # asn1-5.4.3 common_test-1.30 compiler-9.0.6 crypto-5.8.3 debugger-6.0.3 dialyzer-5.4 diameter-2.6.1 edoc-1.4.1 eldap-1.2.16 et-1.7.3 eunit-2.10.3 ftp-1.2.4 inets-9.6.2 jinterface-1.15 kernel-10.6.3 megaco-4.8.3 observer-2.18.2 odbc-2.16.1 os_mon-2.11.2 parsetools-2.7.1 public_key-1.20.3 reltool-1.0.3 runtime_tools-2.3.1 sasl-4.3.2 snmp-5.20.2 ssh-5.5.2 stdlib-7.3 syntax_tools-4.0.3 tftp-1.2.4 tools-4.1.4 wx-2.5.4 xmerl-2.1.9 :
OTP-28.4.3 : kernel-10.6.3 ssh-5.5.2 # asn1-5.4.3 common_test-1.30 compiler-9.0.6 crypto-5.8.3 debugger-6.0.3 dialyzer-5.4 diameter-2.6.1 edoc-1.4.1 eldap-1.2.16 erl_interface-5.6.4 erts-16.3.1 et-1.7.3 eunit-2.10.3 ftp-1.2.4 inets-9.6.2 jinterface-1.15 megaco-4.8.3 mnesia-4.25.2 observer-2.18.2 odbc-2.16.1 os_mon-2.11.2 parsetools-2.7.1 public_key-1.20.3 reltool-1.0.3 runtime_tools-2.3.1 sasl-4.3.2 snmp-5.20.2 ssl-11.5.4 stdlib-7.3 syntax_tools-4.0.3 tftp-1.2.4 tools-4.1.4 wx-2.5.4 xmerl-2.1.9 :
Expand Down
Loading