aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_c2s.erl4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 108c9a0cf..d78a86ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-25 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/ejabberd_c2s.erl: Enable zlib only over TCP
+
2006-03-18 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Bugfix (thanks to Sergei Golovan)
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 08d93f742..305b33981 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -208,7 +208,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
Zlib = StateData#state.zlib,
CompressFeature =
case Zlib andalso
- (SockMod /= ejabberd_zlib) of
+ (SockMod == gen_tcp) of
true ->
[{xmlelement, "compression",
[{"xmlns", ?NS_FEATURE_COMPRESS}],
@@ -516,7 +516,7 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
tls_enabled = true
}};
{?NS_COMPRESS, "compress"} when Zlib == true,
- SockMod /= ejabberd_zlib ->
+ SockMod == gen_tcp ->
case xml:get_subtag(El, "method") of
false ->
send_element(StateData,