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

SVN Revision: 1672

diff --git a/ChangeLog b/ChangeLog
index 40a65a070f3091ad44297803b785ddaf02e58472..d43576dcc31e0cc84ec837eea8b1f9f87319103b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 50699e4a6d2d901f7a0a49ee4ee44cbaf196f167..311d955f88a1c130a02033e70486c10dd0698243 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -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