aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-04-04 18:27:44 +0100
committerMatthew Wild <mwild1@gmail.com>2018-04-04 18:27:44 +0100
commit65390ee28540819d96ec84938895e7284d5cb576 (patch)
tree5d889dd44eb613a90e5beaeb919e59602fdf55c8
parent0ef433ac6603079bcb8b5b41cd08889ce495e7af (diff)
downloadprosody-65390ee28540819d96ec84938895e7284d5cb576.tar.gz
prosody-65390ee28540819d96ec84938895e7284d5cb576.zip
net.http: Fix parameter order to http request callbacks
Commit e3b9dc9dd940 changed the parameter order in 2013, but did not update the names of the parameters in the callback function. Due to this inconsistency, 12df41a5a4b1 accidentally reversed the order when fixing the variable names without fixing where they are used. Additionally the documentation was incorrect (since 2013), and this has also now been fixed.
-rw-r--r--net/http.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http.lua b/net/http.lua
index 8364a104..cc67a45c 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -238,7 +238,7 @@ local function request(self, u, ex, callback)
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";