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 | 1e5040dab723c166096811422eaf3ae8e338b00e (patch) | |
| tree | a097c4f3a59bd0cc87d76bf637dff458fb5ff330 /plugins/mod_s2s/s2sout.lib.lua | |
| parent | 61db12f927ed7e3532862616919623e8bac306f8 (diff) | |
| parent | 04b647a6e847fa6ace495f3c8c7a2e9a5425fb1a (diff) | |
| download | prosody-1e5040dab723c166096811422eaf3ae8e338b00e.tar.gz prosody-1e5040dab723c166096811422eaf3ae8e338b00e.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 |