Software /
code /
prosody
Diff
net/httpserver.lua @ 1054:084d265b37cf
Merge with 0.4 branch
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 23 Apr 2009 21:06:08 +0100 |
parent | 1038:90f663769b75 |
parent | 1053:c04b40a0740b |
child | 1112:e8a00a2ea910 |
line wrap: on
line diff
--- a/net/httpserver.lua Thu Apr 23 03:28:35 2009 +0100 +++ b/net/httpserver.lua Thu Apr 23 21:06:08 2009 +0100 @@ -30,7 +30,7 @@ -- 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 @@ 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);