summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2016-03-16 11:11:43 +0100
committerBadlop <badlop@process-one.net>2016-03-16 11:11:43 +0100
commitc985a2bd3da2252fc604eea7b4d5b31ae1c5fcff (patch)
treeccc9e66d5261f63596facb17958991f351bc2a53 /src
parentWhen building Elixir inside ejabberd, rely on version 1.1 for Erlang R17 comp... (diff)
Start ezlib only if required, as it's optional (#1006)
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_app.erl1
-rw-r--r--src/ejabberd_receiver.erl1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 66de3ceb..e493eac0 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -256,7 +256,6 @@ start_apps() ->
ejabberd:start_app(fast_tls),
ejabberd:start_app(fast_xml),
ejabberd:start_app(stringprep),
- ejabberd:start_app(ezlib),
ejabberd:start_app(cache_tab).
opt_type(net_ticktime) ->
diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl
index 9fdc86f8..0a33e30e 100644
--- a/src/ejabberd_receiver.erl
+++ b/src/ejabberd_receiver.erl
@@ -141,6 +141,7 @@ handle_call({starttls, TLSSocket}, _From, State) ->
handle_call({compress, Data}, _From,
#state{socket = Socket, sock_mod = SockMod} =
State) ->
+ ejabberd:start_app(ezlib),
{ok, ZlibSocket} = ezlib:enable_zlib(SockMod,
Socket),
if Data /= undefined -> do_send(State, Data);