diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:34:38 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:34:38 +0000 |
| commit | 74531442db8df026d362695700a9ff23345dde96 (patch) | |
| tree | d2c50b12dcf99d03ae30b92a7b72a9ea2203b31b /plugins/mod_s2s/s2sout.lib.lua | |
| parent | 58049837e7a14744f37d0250c3a854bc312d9106 (diff) | |
| parent | 0c46e400afa7fef669b2f3a9ea2ed76633e8652b (diff) | |
| download | prosody-74531442db8df026d362695700a9ff23345dde96.tar.gz prosody-74531442db8df026d362695700a9ff23345dde96.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 |