Merge with waqas

Tue, 18 Aug 2009 15:59:58 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 18 Aug 2009 15:59:58 +0100
changeset 1717
beadd8da061c
parent 1715
3a5b6cd6b8c9 (current diff)
parent 1716
3f7fd1445d02 (diff)
child 1718
af3d0c329396

Merge with waqas

--- a/plugins/mod_compression.lua	Tue Aug 18 15:59:11 2009 +0100
+++ b/plugins/mod_compression.lua	Tue Aug 18 15:59:58 2009 +0100
@@ -50,7 +50,7 @@
 					local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed");
 					session.send(error_st);
 					session:log("error", "Failed to create zlib.deflate filter.");
-					module:log("error", inflate_stream);
+					module:log("error", deflate_stream);
 					return
 				end
 				
@@ -88,10 +88,10 @@
 							if status == false then
 								session:close({
 								  condition = "undefined-condition";
-								  text = compressed;
+								  text = decompressed;
 								  extra = st.stanza("failure", {xmlns="http://jabber.org/protocol/compress"}):tag("processing-failed");
 								});
-								module:log("error", compressed);
+								module:log("error", decompressed);
 								return;
 							end
 							old_data(conn, decompressed);

mercurial