aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-05-22 22:25:59 +0200
committerKim Alvefur <zash@zash.se>2018-05-22 22:25:59 +0200
commit5815bbfc2586899d514bc2b2dfd56c69b9939ed0 (patch)
tree54d397a353338cb5ac1a004ec5f86cc834a06248
parentd11db6533450a7ac6324963ab6245032ff5b3ba9 (diff)
parent99ded745a65df5d35a5d4aad15c6acad34ea73c9 (diff)
downloadprosody-5815bbfc2586899d514bc2b2dfd56c69b9939ed0.tar.gz
prosody-5815bbfc2586899d514bc2b2dfd56c69b9939ed0.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_c2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index d22c5625..b634b843 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -172,7 +172,7 @@ local function session_close(session, reason)
function session.send() return false; end
local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason;
- session.log("debug", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason_text or "session closed");
+ session.log("debug", "c2s stream for %s closed: %s", session.full_jid or session.ip or "<unknown>", reason_text or "session closed");
-- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
local conn = session.conn;