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

Fix bug that couldn't connect if starttls_required and zlib were set (EJAB-1118)

SVN Revision: 2789
This commit is contained in:
Badlop 2009-12-07 15:54:25 +00:00
parent 3aa242e2c7
commit f044d6ed28

View File

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