diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-16 18:49:14 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-16 18:49:14 +0100 |
| commit | 478a2d42e6f1be1c45732d3851a65a99ea09565c (patch) | |
| tree | a097c4f3a59bd0cc87d76bf637dff458fb5ff330 /plugins/mod_s2s/s2sout.lib.lua | |
| parent | 58049837e7a14744f37d0250c3a854bc312d9106 (diff) | |
| parent | ee9ef878c4f1702f3bacfd8d3c0c98844c3b481f (diff) | |
| download | prosody-478a2d42e6f1be1c45732d3851a65a99ea09565c.tar.gz prosody-478a2d42e6f1be1c45732d3851a65a99ea09565c.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_s2s/s2sout.lib.lua')
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 07623968..5ebbee8e 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -44,15 +44,9 @@ local function compare_srv_priorities(a,b) return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight); end -local function session_open_stream(session, from, to) - session.sends2s(st.stanza("stream:stream", { - xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', - ["xmlns:stream"]='http://etherx.jabber.org/streams', - from=from, to=to, version='1.0', ["xml:lang"]='en'}):top_tag()); -end - function s2sout.initiate_connection(host_session) initialize_filters(host_session); + host_session.version = 1; host_session.open_stream = session_open_stream; -- Kick the connection attempting machine into life |