aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-12-07 15:54:25 +0000
committerBadlop <badlop@process-one.net>2009-12-07 15:54:25 +0000
commitf044d6ed28dc41ef681a6102ddb9023b2879b9a3 (patch)
tree6f130a396bceb87dfa3c48f3bd14c08acc6d34c6 /src
parentprevent sending duplicated last items if several resources online (EJAB-1116) (diff)
Fix bug that couldn't connect if starttls_required and zlib were set (EJAB-1118)
SVN Revision: 2789
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_c2s.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 87a83992f..69f615a10 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -187,7 +187,6 @@ init([{SockMod, Socket}, Opts]) ->
(_) -> false
end, Opts),
TLSOpts = [verify_none | TLSOpts1],
- Zlib = lists:member(zlib, Opts) andalso (not StartTLSRequired),
IP = peerip(SockMod, Socket),
%% Check if IP is blacklisted:
case is_ip_blacklisted(IP) of