aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-03 15:53:00 +0200
committerKim Alvefur <zash@zash.se>2016-04-03 15:53:00 +0200
commitc1a8a485f70d97442364fa0905a5acefc6be69e0 (patch)
tree94c7296d03a9c7fb4893a8de8e0b3fdabd3875e2 /plugins
parent0ef7cd43e5d98a3365de336cee70eac1cfdeb5e7 (diff)
parentcde08c4f4b6c0b9a0f4ecff49d1fc8e0110bb9c1 (diff)
downloadprosody-c1a8a485f70d97442364fa0905a5acefc6be69e0.tar.gz
prosody-c1a8a485f70d97442364fa0905a5acefc6be69e0.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_c2s.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 42c35689..a690e9be 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -178,6 +178,9 @@ local function session_close(session, reason)
sm_destroy_session(session, reason);
conn:close();
end
+ else
+ local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
+ sm_destroy_session(session, reason);
end
end