prosody
92e329e1cd99%3Ac1a85068ca36
Software / code / prosody
Changeset
2257:c1a85068ca36
Merge with Tobias
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 28 Nov 2009 17:40:49 +0000 |
| parents | 2256:482bc84c15ea (diff) 2255:92e329e1cd99 (current diff) |
| children | 2258:e4c5d0d21ac7 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/net/xmppserver_listener.lua Sat Nov 28 18:32:41 2009 +0100 +++ b/net/xmppserver_listener.lua Sat Nov 28 17:40:49 2009 +0000 @@ -100,10 +100,10 @@ end end session.sends2s("</stream:stream>"); - if session.notopen or not session.conn.close() then - session.conn.close(true); -- Force FIXME: timer? + if session.notopen or not session.conn:close() then + session.conn:close(true); -- Force FIXME: timer? end - session.conn.close(); + session.conn:close(); xmppserver.ondisconnect(session.conn, "stream error"); end end
--- a/plugins/mod_console.lua Sat Nov 28 18:32:41 2009 +0100 +++ b/plugins/mod_console.lua Sat Nov 28 17:40:49 2009 +0000 @@ -37,7 +37,7 @@ local session = { conn = conn; send = function (t) w(tostring(t)); end; print = function (t) w("| "..tostring(t).."\n"); end; - disconnect = function () conn.close(); end; + disconnect = function () conn:close(); end; }; session.env = setmetatable({}, default_env_mt);
