Software / code / prosody
Changeset
6608:b6e558febb7a
Merge with merge merge merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:19:44 +0000 |
| parents | 6607:64e6b88b6b21 (current diff) 6605:03a43bf3ecd2 (diff) |
| children | 6609:d2faaaca695d 6610:7c4cf87f4dff |
| files | net/http/server.lua plugins/mod_s2s/mod_s2s.lua util-src/encodings.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua Fri Mar 27 22:11:58 2015 +0000 +++ b/plugins/mod_s2s/mod_s2s.lua Fri Mar 27 22:19:44 2015 +0000 @@ -499,6 +499,12 @@ if not from or (hosts[from] and hosts[from].modules.dialback) then attr["xmlns:db"] = 'jabber:server:dialback'; end + if not from then + attr.from = ''; + end + if not to then + attr.to = ''; + end end -- Session initialization logic shared by incoming and outgoing
--- a/util-src/encodings.c Fri Mar 27 22:11:58 2015 +0000 +++ b/util-src/encodings.c Fri Mar 27 22:19:44 2015 +0000 @@ -475,7 +475,6 @@ luaL_register(L, NULL, Reg_utf8); lua_setfield(L, -2, "utf8"); - lua_pushliteral(L, "version"); /** version */ lua_pushliteral(L, "-3.14"); lua_setfield(L, -2, "version"); return 1;
