aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-18 01:27:31 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-18 01:27:31 +0000
commit0d6100844b07daef86571021aa8d3492e4da45ee (patch)
tree45c16a4d2f5af162ac863cc8924c27dc80b438d7
parente99e23509b0b20f49bc1d0763947514bb6f5d4d7 (diff)
parent2283fae9c1b85932f6386e8eb421a3c6a319aa84 (diff)
downloadprosody-0d6100844b07daef86571021aa8d3492e4da45ee.tar.gz
prosody-0d6100844b07daef86571021aa8d3492e4da45ee.zip
Merge 0.7->trunk
-rw-r--r--core/s2smanager.lua5
-rw-r--r--plugins/mod_compression.lua6
2 files changed, 3 insertions, 8 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index b65fe00c..f0b802d8 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -369,11 +369,6 @@ function streamopened(session, attr)
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 --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 3ef5a1f3..c2e84f2b 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -170,7 +170,7 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
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 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
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 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
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