X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_compression.lua;h=da55e5bbb7f71f2f905afd474cbe914c082d938d;hb=4586c8a7bcb1d8913ea40005acc41f4205cbf878;hp=3b000303f5ab4b35edfa125802cbced160aa2e57;hpb=4e302b61d1779de49302196e1c88243d0202f28e;p=prosody.git

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 3b000303..da55e5bb 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -45,11 +45,11 @@ module:hook_stanza(xmlns_stream, "features",
 		function (session, stanza)
 			if not session.compressed and session.type == "s2sout" then
 				-- does remote server support compression?
-				local comp_st = stanza:child_with_name("compression");
+				local comp_st = stanza:get_child("compression", xmlns_compression_feature);
 				if comp_st then
 					-- do we support the mechanism
-					for a in comp_st:children() do
-						local algorithm = a[1]
+					for a in comp_st:childtags("method") do
+						local algorithm = a:get_text();
 						if algorithm == "zlib" then
 							session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):tag("method"):text("zlib"))
 							session.log("debug", "Enabled compression using zlib.")
@@ -147,6 +147,12 @@ module:hook("stanza/http://jabber.org/protocol/compress:compressed", function(ev
 	end
 end);
 
+module:hook("stanza/http://jabber.org/protocol/compress:failure", function(event)
+	local err = event.stanza:get_child();
+	(event.origin.log or module._log)("warn", "Compression setup failed (%s)", err and err.name or "unknown reason");
+	return true;
+end);
+
 module:hook("stanza/http://jabber.org/protocol/compress:compress", function(event)
 	local session, stanza = event.origin, event.stanza;
 
@@ -160,8 +166,7 @@ module:hook("stanza/http://jabber.org/protocol/compress:compress", function(even
 		end
 
 		-- checking if the compression method is supported
-		local method = stanza:child_with_name("method");
-		method = method and (method[1] or "");
+		local method = stanza:get_child_text("method");
 		if method == "zlib" then
 			session.log("debug", "zlib compression enabled.");