Merge with merge merge merge

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index f9165f20288f7b21a9e3b918c9aed15fffa38c54..a58c64213817e8d1a27adb96d8accadb5b857608 100644 (file)
--- 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 529a6c22832b58575a1df6be597ee6840aee7bd9..5fa9706b63bbe306c09ed96fe0cfd3417f85528b 100644 (file)
--- 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;