Software /
code /
prosody
Diff
net/http/server.lua @ 8366:272ff3ab25f3
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sun, 29 Oct 2017 02:05:19 +0200 |
parent | 8362:c7d6c2558a24 |
child | 9335:2dc7490899ae |
line wrap: on
line diff
--- a/net/http/server.lua Wed Oct 25 21:59:33 2017 +0200 +++ b/net/http/server.lua Sun Oct 29 02:05:19 2017 +0200 @@ -229,7 +229,7 @@ if err then response.status_code = err_code; - response:send(events.fire_event("http-error", { code = err_code, message = err })); + response:send(events.fire_event("http-error", { code = err_code, message = err, response = response })); return; end @@ -244,7 +244,8 @@ if result_type == "number" then response.status_code = result; if result >= 400 then - body = events.fire_event("http-error", { code = result }); + payload.code = result; + body = events.fire_event("http-error", payload); end elseif result_type == "string" then body = result; @@ -266,7 +267,8 @@ -- if handler not called, return 404 response.status_code = 404; - response:send(events.fire_event("http-error", { code = 404 })); + payload.code = 404; + response:send(events.fire_event("http-error", payload)); end local function prepare_header(response) local status_line = "HTTP/"..response.request.httpversion.." "..(response.status or codes[response.status_code]);