summaryrefslogtreecommitdiff
path: root/src/rabbit_networking.erl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-07-31 13:06:16 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-07-31 13:06:16 +0100
commit09b934a686384267afdb28fe3b4bba4d9bcca78c (patch)
tree97db40e02fbc1aa2043d545da2dda08e046e7096 /src/rabbit_networking.erl
parentac666e08c5405aa0b4e27a7edaaaf05d60e1e55e (diff)
parentd99108bf76d3ddb972683217ae3e3e62583d036c (diff)
downloadrabbitmq-server-09b934a686384267afdb28fe3b4bba4d9bcca78c.tar.gz
Refresh branch from stable
Diffstat (limited to 'src/rabbit_networking.erl')
-rw-r--r--src/rabbit_networking.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 6ed6239c..46cfabe3 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -145,7 +145,8 @@ start() -> rabbit_sup:start_supervisor_child(
{rabbit_connection_sup,start_link,[]}]).
ensure_ssl() ->
- ok = app_utils:start_applications([asn1, crypto, public_key, ssl]),
+ {ok, SslAppsConfig} = application:get_env(rabbit, ssl_apps),
+ ok = app_utils:start_applications(SslAppsConfig),
{ok, SslOptsConfig} = application:get_env(rabbit, ssl_options),
% unknown_ca errors are silently ignored prior to R14B unless we