diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-04-04 18:42:05 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-04-04 18:42:05 +0100 |
| commit | ac665260b87e90bf6c5a0700b22db5a54701f9c6 (patch) | |
| tree | 192dddbb9a5b935e8686f7b67a483a028fd67fec | |
| parent | 574ae71c70e6d775bd0ef735b2c0f84addc23f95 (diff) | |
| parent | 0e4c35dd868723eb1bf99dc72484fd076fffb9f6 (diff) | |
| download | prosody-ac665260b87e90bf6c5a0700b22db5a54701f9c6.tar.gz prosody-ac665260b87e90bf6c5a0700b22db5a54701f9c6.zip | |
Merge 0.10 -> trunk
| -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 c85fa056..997c8d7e 100644 --- a/net/http.lua +++ b/net/http.lua @@ -100,7 +100,7 @@ function listener.onconnect(conn) 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"; |