diff options
| author | David Wragg <david@rabbitmq.com> | 2010-06-29 20:27:45 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-06-29 20:27:45 +0100 |
| commit | ce658f9bbab8ef4df386b4845a5705a8f0728ff9 (patch) | |
| tree | 83be6be386d0a8d48fa87612319527039090bd4a | |
| parent | 4216b575aa8c9a1350cd06a52a88804e4f14dba7 (diff) | |
| parent | b385b803079282c5b7e69f82fa8ec54908cf798f (diff) | |
| download | rabbitmq-server-git-ce658f9bbab8ef4df386b4845a5705a8f0728ff9.tar.gz | |
merge bug22882 into default (ssl is even more broken with rabbit in R14A)
| -rw-r--r-- | ebin/rabbit_app.in | 4 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index bdf407eb93..ce94cafe62 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -11,8 +11,8 @@ rabbit_sup, rabbit_tcp_client_sup]}, {applications, [kernel, stdlib, sasl, mnesia, os_mon]}, -%% we also depend on ssl but it shouldn't be in here as we don't -%% actually want to start it +%% we also depend on crypto, public_key and ssl but they shouldn't be +%% in here as we don't actually want to start it {mod, {rabbit, []}}, {env, [{tcp_listeners, [{"0.0.0.0", 5672}]}, {ssl_listeners, []}, diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index c3d0b7b786..68ffc98ad7 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -102,7 +102,7 @@ boot_ssl() -> {ok, []} -> ok; {ok, SslListeners} -> - ok = rabbit_misc:start_applications([crypto, ssl]), + ok = rabbit_misc:start_applications([crypto, public_key, ssl]), {ok, SslOpts} = application:get_env(ssl_options), [start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners], ok |