Merge 0.9->0.10

diff --cc net/dns.lua
Simple merge

diff --cc plugins/mod_http_files.lua
Simple merge

diff --cc tests/test.lua
index 1666fcf5199e8de327b05db19cb78162e03e6bff,bb11ab267bd487584e8782b70d47f83af20728cd..5d5851e128b20d340b9c1a2f988c71b15fce8954
--- 1/tests/test.lua
--- 2/tests/test.lua
+++ b/tests/test.lua
@@@ -12,8 -12,9 +12,9 @@@ function run_all_tests(
        package.loaded["net.connlisteners"] = { get = function () return {} end };
        dotest "util.jid"
        dotest "util.multitable"
 -      dotest "util.rfc3484"
 -      dotest "net.http"
 +      dotest "util.rfc6724"
 +      dotest "util.http"
+       dotest "core.modulemanager"
        dotest "core.stanza_router"
        dotest "core.s2smanager"
        dotest "core.configmanager"
@@@ -138,11 -135,14 +139,14 @@@ function dotest(unitname
                print("WARNING: ", "Failed to load module: "..unitname, err);
                return;
        end
 -      
 +
        local oldmodule, old_M = _fakeG.module, _fakeG._M;
-       _fakeG.module = function () _M = unit end
+       _fakeG.module = function ()
+               setmetatable(unit, nil);
+               unit._M = unit;
+       end
        setfenv(chunk, unit);
-       local success, ret = pcall(chunk);
+       local success, err = pcall(chunk);
        _fakeG.module, _fakeG._M = oldmodule, old_M;
        if not success then
                print("WARNING: ", "Failed to initialise module: "..unitname, err);

diff --cc util/ip.lua
Simple merge