diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:19:44 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:19:44 +0000 |
| commit | 2f531bc782386106af9c8f297594a13c81ae660c (patch) | |
| tree | 69f565f2bab115b3662d43441fde35e4d05a572f | |
| parent | 29f906c30d10ce983b6c034d88bf7a3c8b576bb0 (diff) | |
| parent | 77b653d31a2a47e92cae7ddfa18961bdc2b365e8 (diff) | |
| download | prosody-2f531bc782386106af9c8f297594a13c81ae660c.tar.gz prosody-2f531bc782386106af9c8f297594a13c81ae660c.zip | |
Merge with merge merge merge
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 6 | ||||
| -rw-r--r-- | util-src/encodings.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index f9165f20..a58c6421 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -499,6 +499,12 @@ function session_stream_attrs(session, from, to, attr) 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 diff --git a/util-src/encodings.c b/util-src/encodings.c index 529a6c22..5fa9706b 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -475,7 +475,6 @@ LUALIB_API int luaopen_util_encodings(lua_State *L) 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; |