diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-18 01:25:50 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-18 01:25:50 +0000 |
| commit | 2283fae9c1b85932f6386e8eb421a3c6a319aa84 (patch) | |
| tree | ef724f4fc6be2eba70b44822e2e82c620583b8ca | |
| parent | 48e4e284e95e0d8ea1d65357b3aef3740ee9a4d8 (diff) | |
| parent | 4528953bcd7937bdd9d46c9cd07b6c0cbae94244 (diff) | |
| download | prosody-2283fae9c1b85932f6386e8eb421a3c6a319aa84.tar.gz prosody-2283fae9c1b85932f6386e8eb421a3c6a319aa84.zip | |
Merge 0.6->0.7
| -rw-r--r-- | core/s2smanager.lua | 5 | ||||
| -rw-r--r-- | plugins/mod_compression.lua | 6 |
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 |