diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-27 22:42:36 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-27 22:42:36 +0100 |
| commit | 6ac4d843f0453b79529cb15656832579111dc53d (patch) | |
| tree | 082461b99809451588e9ddc273d9cb33e61d272f | |
| parent | 78a1d61bae7f554be06b8ecb93eab579769bbaed (diff) | |
| parent | 4b7aa0ca1f830e71ee4f043c6699d78e3123cd65 (diff) | |
| download | prosody-6ac4d843f0453b79529cb15656832579111dc53d.tar.gz prosody-6ac4d843f0453b79529cb15656832579111dc53d.zip | |
Merge with 0.5
| -rw-r--r-- | core/stanza_router.lua | 6 | ||||
| -rw-r--r-- | net/httpserver.lua | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 6dc4274b..dac098bb 100644 --- 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 fefd289b..699e0324 100644 --- 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); |