util.pposix: Compatibility with Solaris systems (thanks Filip)

[prosody.git] / plugins / mod_compression.lua

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 14265025546ac0bd4674a379bb8adcfb76cb1ea2..f1cae7378e23019ae8b6063eb4a8aa9a6582cda7 100644 (file)
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -35,8 +35,15 @@ module:add_event_hook("stream-features",
 );
 
 -- TODO Support compression on S2S level too.
-module:add_handler({"c2s_unauthed", "c2s_authed"}, "compress", xmlns_compression_protocol,
+module:add_handler({"c2s_unauthed", "c2s"}, "compress", xmlns_compression_protocol,
                function(session, stanza)
+                       -- fail if we are already compressed
+                       if session.compressed then
+                               local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
+                               session.send(error_st);
+                               session:log("warn", "Tried to establish another compression layer.");
+                       end
+                       
                        -- checking if the compression method is supported
                        local method = stanza:child_with_name("method")[1];
                        if method == "zlib" then
@@ -74,7 +81,7 @@ module:add_handler({"c2s_unauthed", "c2s_authed"}, "compress", xmlns_compression
                                                                text = compressed;
                                                                extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
                                                        });
-                                                       module:log("error", compressed);
+                                                       module:log("warn", compressed);
                                                        return;
                                                end
                                                old_send(compressed);
@@ -91,7 +98,7 @@ module:add_handler({"c2s_unauthed", "c2s_authed"}, "compress", xmlns_compression
                                                                        text = decompressed;
                                                                        extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
                                                                });
-                                                               module:log("error", decompressed);
+                                                               module:log("warn", decompressed);
                                                                return;
                                                        end
                                                        old_data(conn, decompressed);