diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-03 15:52:40 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-03 15:52:40 +0200 |
commit | 5e6475392910df01592a526e564634fc19c1c887 (patch) | |
tree | 4638d1171ad6d0127b6c0f99e7267837b51de056 /plugins | |
parent | 5db607f37e4370d12d350c0894804331a0231d5e (diff) | |
parent | 4308f867bbf943eb472034807effd8bddf724fa2 (diff) | |
download | prosody-5e6475392910df01592a526e564634fc19c1c887.tar.gz prosody-5e6475392910df01592a526e564634fc19c1c887.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_c2s.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua index d950225d..2829d5fd 100644 --- a/plugins/mod_c2s.lua +++ b/plugins/mod_c2s.lua @@ -179,6 +179,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 |