aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-04-23 21:06:51 +0100
committerMatthew Wild <mwild1@gmail.com>2009-04-23 21:06:51 +0100
commit2e3907bc3e56c60f947ebda858c632e9a5110943 (patch)
treeb441067f58db864cb5cc070e8ba08d6f45b2e45c /net
parent3ab59e41d362ca0f1e30f18763ad9522359f6b0b (diff)
parentc2e552a434eda3c9616d51f055bb459bbf561816 (diff)
downloadprosody-2e3907bc3e56c60f947ebda858c632e9a5110943.tar.gz
prosody-2e3907bc3e56c60f947ebda858c632e9a5110943.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'net')
-rw-r--r--net/httpserver.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 79cf33c2..0ecf84ea 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -30,7 +30,7 @@ local function send_response(request, response)
-- Write status line
local resp;
if response.body then
- log("debug", "Sending response to %s: %s", request.id, response.body);
+ log("debug", "Sending response to %s", request.id);
resp = { "HTTP/1.0 ", response.status or "200 OK", "\r\n"};
local h = response.headers;
if h then
@@ -99,7 +99,7 @@ local function call_callback(request, err)
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));
- else
+ elseif response ~= true then
-- Assume response
send_response(request, response);
destroy_request(request);