# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1522863725 -3600
# Node ID fd39c44c01130573808b50c8523dd961da58cec0
# Parent  b7a22baaf55f7e984004d61fb91381584e7e7fd4# Parent  e2919978673e76f5014633f9b244c2fe99c6665f
Merge 0.10 -> trunk

diff -r b7a22baaf55f -r fd39c44c0113 net/http.lua
--- 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";
diff -r b7a22baaf55f -r fd39c44c0113 plugins/muc/mod_muc.lua