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.

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index c8d3cd04e97d0fd5f1d836de1b76429d6eda28ed..d8d0a400a03508e49709469539ce33e4e9b458be 100644 (file)
--- 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 594fbb2c795a03adf0069f5e66dd84aad983cdd1..a30f2f438d0f3c7ece331cbc342a2bf888c0038c 100644 (file)
--- 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,