summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-05-30 11:50:23 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2014-05-30 11:50:23 +0100
commit6d120926e6020cb827704280840be464ee15484a (patch)
tree3ccd41e98a125f68c289cc7b0ddec500e8498735
parentfb861712d07ec9d31be357f68be00a3ed08d7df7 (diff)
parent75c7fa93f6499026cac7d233934dd32991f168d8 (diff)
downloadrabbitmq-server-git-6d120926e6020cb827704280840be464ee15484a.tar.gz
merge stable into default
-rw-r--r--src/rabbit_networking.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 1da977262f..9082dbd353 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -135,8 +135,8 @@ boot_ssl() ->
{ok, []} ->
ok;
{ok, SslListeners} ->
- [start_ssl_listener(Listener, ensure_ssl())
- || Listener <- SslListeners],
+ SslOpts = ensure_ssl(),
+ [start_ssl_listener(Listener, SslOpts) || Listener <- SslListeners],
ok
end.