Software / code / prosody
Changeset
8707:fd39c44c0113
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Apr 2018 18:42:05 +0100 |
| parents | 8701:b7a22baaf55f (current diff) 8706:e2919978673e (diff) |
| children | 8709:3521ff896831 |
| files | net/http.lua plugins/muc/mod_muc.lua |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/http.lua Fri Mar 30 12:12:50 2018 +0200 +++ b/net/http.lua Wed Apr 04 18:42:05 2018 +0100 @@ -100,7 +100,7 @@ end log("debug", "Request '%s': Calling callback, status %s", req.id, code or "---"); - return log_if_failed(req.id, xpcall(function () return callback(content, code, request, response) end, handleerr)); + return log_if_failed(req.id, xpcall(function () return callback(content, code, response, request) end, handleerr)); end req.reader = request_reader; req.state = "status";
