Software / code / prosody
Diff
net/httpserver.lua @ 1632:4a70cbb0fad7
net.httpserver: Allow response.body to be a non-string
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 05 Aug 2009 03:07:45 +0100 |
| parent | 1608:fb53fe17af36 |
| child | 1661:33b1aee4b77f |
line wrap: on
line diff
--- a/net/httpserver.lua Mon Aug 03 21:48:51 2009 +0500 +++ b/net/httpserver.lua Wed Aug 05 03:07:45 2009 +0100 @@ -37,6 +37,7 @@ -- Write status line local resp; if response.body then + local body = tostring(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; @@ -48,15 +49,15 @@ t_insert(resp, "\r\n"); end end - if response.body and not (h and h["Content-Length"]) then + if not (h and h["Content-Length"]) then t_insert(resp, "Content-Length: "); - t_insert(resp, #response.body); + t_insert(resp, #body); t_insert(resp, "\r\n"); end t_insert(resp, "\r\n"); - if response.body and request.method ~= "HEAD" then - t_insert(resp, response.body); + if request.method ~= "HEAD" then + t_insert(resp, body); end else -- Response we have is just a string (the body)
