diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-03 15:53:00 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-03 15:53:00 +0200 |
| commit | d00290510d93265adb1ca29f17a15a168349c441 (patch) | |
| tree | 94c7296d03a9c7fb4893a8de8e0b3fdabd3875e2 | |
| parent | d5c31923e6b7d3884d3b7d16b8dae355511d9773 (diff) | |
| parent | 5e6475392910df01592a526e564634fc19c1c887 (diff) | |
| download | prosody-d00290510d93265adb1ca29f17a15a168349c441.tar.gz prosody-d00290510d93265adb1ca29f17a15a168349c441.zip | |
Merge 0.10->trunk
| -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 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 |