25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

* src/ejabberd_c2s.erl: Disable zlib when STARTTLS is required

SVN Revision: 1672
This commit is contained in:
Alexey Shchepin 2008-11-03 13:54:42 +00:00
parent f032cf3380
commit 8cdebd485a
2 changed files with 5 additions and 0 deletions

View File

@ -1,3 +1,7 @@
2008-11-03 Alexey Shchepin <alexey@process-one.net>
* src/ejabberd_c2s.erl: Disable zlib when STARTTLS is required
2008-10-27 Badlop <badlop@process-one.net>
* src/Makefile.in (clean-local): Delete also ejabberdctl.example

View File

@ -176,6 +176,7 @@ init([{SockMod, Socket}, Opts]) ->
TLSOpts = lists:filter(fun({certfile, _}) -> true;
(_) -> false
end, Opts),
Zlib = lists:member(zlib, Opts) andalso (not StartTLSRequired),
IP = peerip(SockMod, Socket),
%% Check if IP is blacklisted:
case is_ip_blacklisted(IP) of