Merge 0.9->0.10

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index d950225deccae9b0336788a2e27a318b32900ff9..2829d5fdb61fe221d59f22d65d618abcf8c5ee68 100644 (file)
--- 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