diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-03-24 11:29:04 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-03-24 11:29:04 +0000 |
| commit | cf9743127cbca95472fde5f6d57956002272bd2d (patch) | |
| tree | 139c9218eeda4771a623b1cecc5c9994f7c92705 /net | |
| parent | 9cd0153dd77ff1a2ecb4f5e3c0bc9719b263c238 (diff) | |
| download | prosody-cf9743127cbca95472fde5f6d57956002272bd2d.tar.gz prosody-cf9743127cbca95472fde5f6d57956002272bd2d.zip | |
net.http: Fix for Lua 5.2: return error from error handler (xpcall changed)
Diffstat (limited to 'net')
| -rw-r--r-- | net/http.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http.lua b/net/http.lua index c17d734c..01dfd7bc 100644 --- a/net/http.lua +++ b/net/http.lua @@ -36,7 +36,7 @@ local function make_id(req) return (tostring(req):match("%x+$")); end local listener = { default_port = 80, default_mode = "*a" }; -- Request-related helper functions -local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); end +local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); return err; end local function log_if_failed(id, ret, ...) if not ret then log("error", "Request '%s': error in callback: %s", id, tostring((...))); |