aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_sup.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-10-06 11:53:52 +0200
committerIngela Anderton Andin <[email protected]>2011-10-06 11:53:52 +0200
commit00202339445daae6ed931f28f932089d5c3dd455 (patch)
treec08c4bb7b615ccb1b3325ce7ad65179a5f15be2a /lib/ssl/src/ssl_sup.erl
parent811e0de29d02031acb0771e1fa74d8f4f97574a6 (diff)
parent64a3651b3ece1a1e3195f20e37247f929d179f61 (diff)
downloadotp-00202339445daae6ed931f28f932089d5c3dd455.tar.gz
otp-00202339445daae6ed931f28f932089d5c3dd455.tar.bz2
otp-00202339445daae6ed931f28f932089d5c3dd455.zip
Merge branch 'ia/ssl/remove-old-ssl/OTP-7048'
* ia/ssl/remove-old-ssl/OTP-7048: Remove old ssl implementation and deprecated function ssl:peercert/1 Conflicts: lib/ssl/test/Makefile
Diffstat (limited to 'lib/ssl/src/ssl_sup.erl')
-rw-r--r--lib/ssl/src/ssl_sup.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl
index a008682b89..cb10b1362a 100644
--- a/lib/ssl/src/ssl_sup.erl
+++ b/lib/ssl/src/ssl_sup.erl
@@ -51,16 +51,15 @@ init([]) ->
%% Does not start any port programs so it does matter
%% so much if it is not used!
- Child2 = {ssl_broker_sup, {ssl_broker_sup, start_link, []},
- permanent, 2000, supervisor, [ssl_broker_sup]},
+ %% Child2 = {ssl_broker_sup, {ssl_broker_sup, start_link, []},
+ %% permanent, 2000, supervisor, [ssl_broker_sup]},
%% New ssl
SessionCertManager = session_and_cert_manager_child_spec(),
ConnetionManager = connection_manager_child_spec(),
- {ok, {{one_for_all, 10, 3600}, [Child2, SessionCertManager,
- ConnetionManager]}}.
+ {ok, {{one_for_all, 10, 3600}, [SessionCertManager, ConnetionManager]}}.
manager_opts() ->