Mercurial > prosody-hg

comparison plugins/mod_s2s/mod_s2s.lua @ 6603:e702ae7aa3d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 26 Mar 2015 16:49:03 +0000
parents 61b6a4fc65f1
children b6e558febb7a
comparison
equal deleted inserted replaced
6588:93423244dc5b 6603:e702ae7aa3d9
497 497
498 function session_stream_attrs(session, from, to, attr) 498 function session_stream_attrs(session, from, to, attr)
499 if not from or (hosts[from] and hosts[from].modules.dialback) then 499 if not from or (hosts[from] and hosts[from].modules.dialback) then
500 attr["xmlns:db"] = 'jabber:server:dialback'; 500 attr["xmlns:db"] = 'jabber:server:dialback';
501 end 501 end
502 if not from then
503 attr.from = '';
504 end
505 if not to then
506 attr.to = '';
507 end
502 end 508 end
503 509
504 -- Session initialization logic shared by incoming and outgoing 510 -- Session initialization logic shared by incoming and outgoing
505 local function initialize_session(session) 511 local function initialize_session(session)
506 local stream = new_xmpp_stream(session, stream_callbacks); 512 local stream = new_xmpp_stream(session, stream_callbacks);