Merge with 0.5

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 6dc4274b39d2e67cda71cb8b6693ab371f73986f..dac098bbccae4af59c7d044d79f027e4303f706a 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -150,11 +150,7 @@ function core_post_stanza(origin, stanza)
                        component_handle_stanza(origin, stanza);
                        return;
                end
-               if not modules_handle_stanza(h.host, origin, stanza) then
-                       if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
-                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-                       end
-               end
+               modules_handle_stanza(h.host, origin, stanza);
        else
                core_route_stanza(origin, stanza);
        end

diff --git a/net/httpserver.lua b/net/httpserver.lua
index fefd289bc322daaa25f6d5bd94a1925753ac8b47..699e0324dfcb35565fd5a3e46bd3ad6c61421292 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -105,7 +105,7 @@ local function call_callback(request, err)
                if response then
                        if response == true and not request.destroyed then
                                -- Keep connection open, we will reply later
-                               log("warn", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
+                               log("debug", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
                        elseif response ~= true then
                                -- Assume response
                                send_response(request, response);