# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1268874999 0
# Node ID 955a12ac985ea41b54dd3e665e3c6afe340ddb6f
# Parent  c1e6df7cf56a285560e044a88ab499ba7580428f# Parent  6273d4672cb4ec6a80e903743a26863de56fd9c0
Merge 0.6 with waqas

diff -r c1e6df7cf56a -r 955a12ac985e plugins/mod_compression.lua
--- a/plugins/mod_compression.lua	Thu Mar 18 01:15:25 2010 +0000
+++ b/plugins/mod_compression.lua	Thu Mar 18 01:16:39 2010 +0000
@@ -42,7 +42,7 @@
 			if session.compressed then
 				local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed");
 				session.send(error_st);
-				session.log("warn", "Tried to establish another compression layer.");
+				session.log("debug", "Client tried to establish another compression layer.");
 				return;
 			end
 			
@@ -69,7 +69,7 @@
 					return
 				end
 				
-				session.log("info", method.." compression selected.");
+				session.log("debug", "zlib compression enabled.");
 				session.send(st.stanza("compressed", {xmlns=xmlns_compression_protocol}));
 				session:reset_stream();
 
@@ -117,7 +117,7 @@
 					end;
 				session.compressed = true;
 			elseif method then
-				session.log("info", "%s compression selected, but we don't support it.", tostring(method));
+				session.log("debug", "%s compression selected, but we don't support it.", tostring(method));
 				local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
 				session.send(error_st);
 			else