From 15d184a909f7d89fff141b0b24dca0be7f9fd0a2 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 11 Apr 2016 22:50:11 +0200 Subject: Disable TLS compression for s2s by default TLS compression is not recommended, and it's already disabled by default for c2s connections and for ejabberd_http. --- src/ejabberd_s2s_in.erl | 2 +- src/ejabberd_s2s_out.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index c8d3cd04e..d8d0a400a 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -325,7 +325,7 @@ wait_for_feature_request({xmlstreamelement, El}, {s2s_tls_compression, StateData#state.server}, fun(true) -> true; (false) -> false - end, true) of + end, false) of true -> lists:delete(compression_none, TLSOpts1); false -> [compression_none | TLSOpts1] end, diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 594fbb2c7..a30f2f438 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, -- cgit v1.2.3