Software / code / prosody
Changeset
2893:98cbc092c64c
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Mar 2010 01:27:31 +0000 |
| parents | 2888:ab6dac843e9c (current diff) 2892:9f214431de29 (diff) |
| children | 2896:49db4238ecfd |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Wed Mar 17 14:36:23 2010 +0000 +++ b/core/s2smanager.lua Thu Mar 18 01:27:31 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);
--- a/plugins/mod_compression.lua Wed Mar 17 14:36:23 2010 +0000 +++ b/plugins/mod_compression.lua Thu Mar 18 01:27:31 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
