prosody
8d15b073fdbe
core/s2smanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/s2smanager.lua @ 333:8d15b073fdbe

session:disconnect() -> session:close() for consistency with other Lua APIs
author Matthew Wild <mwild1@gmail.com>
date Tue, 18 Nov 2008 19:44:54 +0000
parent 331:830fd67f9378
child 337:4a1dd1c2c219
line wrap: on
line diff
--- a/core/s2smanager.lua	Tue Nov 18 19:40:04 2008 +0000
+++ b/core/s2smanager.lua	Tue Nov 18 19:44:54 2008 +0000
@@ -139,7 +139,7 @@
 		send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host }):top_tag());
 		if session.to_host and not hosts[session.to_host] then
 			-- Attempting to connect to a host we don't serve
-			session:disconnect("host-unknown");
+			session:close("host-unknown");
 			return;
 		end
 	elseif session.direction == "outgoing" then
@@ -230,8 +230,6 @@
 		hosts[session.from_host].s2sout[session.to_host] = nil;
 	end
 	
-	session.conn = nil;
-	session.disconnect = nil;
 	for k in pairs(session) do
 		if k ~= "trace" then
 			session[k] = nil;