mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with 0.5

Browse source
This commit is contained in:
Matthew Wild 2009-07-27 22:42:36 +01:00
commit 6ac4d843f0
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/stanza_router.lua
View file

@ -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

2
net/httpserver.lua
View file

@ -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);