diff options
| author | Kim Alvefur <zash@zash.se> | 2017-10-29 02:05:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-10-29 02:05:19 +0200 |
| commit | 5618526b318176613e65df2bff62db6fa7bb9520 (patch) | |
| tree | 0d8a66dad4d8c64d5cfab32c11132b2c0e1ca301 /net/http | |
| parent | 2455838c48d42e5d60239dcc863bd60df8ba16c3 (diff) | |
| parent | 97b8c701176a111587239b7927a485c81c9ce0b0 (diff) | |
| download | prosody-5618526b318176613e65df2bff62db6fa7bb9520.tar.gz prosody-5618526b318176613e65df2bff62db6fa7bb9520.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/server.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/http/server.lua b/net/http/server.lua index 8aa28f5c..877c7f17 100644 --- a/net/http/server.lua +++ b/net/http/server.lua @@ -229,7 +229,7 @@ function handle_request(conn, request, finish_cb) 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 @@ function handle_request(conn, request, finish_cb) 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 @@ function handle_request(conn, request, finish_cb) -- 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]); |