Software / code / prosody
Changeset
1610:07be0ac220d8
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 27 Jul 2009 22:42:36 +0100 |
| parents | 1607:d81f5bb1f6b8 (current diff) 1609:95d3bcd82334 (diff) |
| children | 1611:e20f90743863 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Mon Jul 27 01:28:22 2009 +0100 +++ b/core/stanza_router.lua Mon Jul 27 22:42:36 2009 +0100 @@ -150,11 +150,7 @@ 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
--- a/net/httpserver.lua Mon Jul 27 01:28:22 2009 +0100 +++ b/net/httpserver.lua Mon Jul 27 22:42:36 2009 +0100 @@ -105,7 +105,7 @@ 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);
