Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6608:b6e558febb7a
Merge with merge merge merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:19:44 +0000 |
| parents | 64e6b88b6b21 61b6a4fc65f1 |
| children | 071611bc4f1d 6735e2d735d6 |
comparison
equal
deleted
inserted
replaced
| 6607:64e6b88b6b21 | 6608:b6e558febb7a |
|---|---|
| 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); |
