# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1268875550 0
# Node ID 9f214431de290ce32d569e8ad0e81bc6d745072b
# Parent  765e7070d0a8b0c33d5278bff92f0858e3f12bdc# Parent  955a12ac985ea41b54dd3e665e3c6afe340ddb6f
Merge 0.6->0.7

diff -r 765e7070d0a8 -r 9f214431de29 core/s2smanager.lua
--- a/core/s2smanager.lua	Wed Mar 17 14:28:26 2010 +0000
+++ b/core/s2smanager.lua	Thu Mar 18 01:25:50 2010 +0000
@@ -369,11 +369,6 @@
 		session.secure = true;
 	end
 	
-	if session.version >= 1.0 and not (attr.to and attr.from) then
-		(session.log or log)("warn", "Remote of stream "..(session.from_host or "(unknown)").."->"..(session.to_host or "(unknown)")
-			.." failed to specify to (%s) and/or from (%s) hostname as per RFC", tostring(attr.to), tostring(attr.from));
-	end
-	
 	if session.direction == "incoming" then
 		-- Send a reply stream header
 		session.to_host = attr.to and nameprep(attr.to);
diff -r 765e7070d0a8 -r 9f214431de29 plugins/mod_compression.lua
--- a/plugins/mod_compression.lua	Wed Mar 17 14:28:26 2010 +0000
+++ b/plugins/mod_compression.lua	Thu Mar 18 01:25:50 2010 +0000
@@ -170,7 +170,7 @@
 			if session.compressed then
 				local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed");
 				(session.sends2s or 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
 			
@@ -178,7 +178,7 @@
 			local method = stanza:child_with_name("method");
 			method = method and (method[1] or "");
 			if method == "zlib" then
-				session.log("debug", "%s compression selected.", tostring(method));
+				session.log("debug", "zlib compression enabled.");
 				
 				-- create deflate and inflate streams
 				local deflate_stream = get_deflate_stream(session);
@@ -204,7 +204,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.sends2s or session.send)(error_st);
 			else