From: Alexey Shchepin <alexey@process-one.net>
Date: Mon, 3 Nov 2008 13:54:42 +0000 (+0000)
Subject: * src/ejabberd_c2s.erl: Disable zlib when STARTTLS is required
X-Git-Tag: v2.1.0~18^2~547
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cdebd485a4558096992bd79f7d37b866791ed1c;p=ejabberd

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

SVN Revision: 1672
---

diff --git a/ChangeLog b/ChangeLog
index 40a65a070..d43576dcc 100644
--- 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 50699e4a6..311d955f8 100644
--- 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