Merge 0.10->trunk

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 42c35689ca357f05b9ba8dac0470674885f95576..a690e9be7f112931f5f77680d21c77de482b0884 100644 (file)
--- 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