diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2008-11-03 13:54:42 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2008-11-03 13:54:42 +0000 |
| commit | 8cdebd485a4558096992bd79f7d37b866791ed1c (patch) | |
| tree | 48eb016d8784c6128dd2dcd31390998e86e3034d | |
| parent | * src/Makefile.in (clean-local): Delete also ejabberdctl.example (diff) | |
* src/ejabberd_c2s.erl: Disable zlib when STARTTLS is required
SVN Revision: 1672
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -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 |