diff options
author | Mickael Remond <mremond@process-one.net> | 2016-04-12 10:34:24 +0200 |
---|---|---|
committer | Mickael Remond <mremond@process-one.net> | 2016-04-12 10:34:24 +0200 |
commit | cd2e2b1a880f93b7198bbc17cb1d9be2c23048e8 (patch) | |
tree | ce38fa8eac3e4540e4792d39f059f6f04a4fab9b /src/ejabberd_s2s_out.erl | |
parent | Allow testing user pattern directly in access rules (diff) |
Synchronizing master changes
Diffstat (limited to 'src/ejabberd_s2s_out.erl')
-rw-r--r-- | src/ejabberd_s2s_out.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 594fbb2c..a30f2f43 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -192,7 +192,7 @@ init([From, Server, Type]) -> {s2s_tls_compression, From}, fun(true) -> true; (false) -> false - end, true) of + end, false) of false -> [compression_none | TLSOpts4]; true -> TLSOpts4 end, |