diff net/http.lua @ 4541:05f5ec99da77

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parents ea24d73e6c94
children 2abe4e541d52
line wrap: on
line diff
--- a/net/http.lua	Sat Dec 10 17:21:19 2011 +0000
+++ b/net/http.lua	Sun Jan 22 22:55:49 2012 +0000
@@ -70,7 +70,7 @@
 		local function success_cb(r)
 			if request.callback then
 				for k,v in pairs(r) do request[k] = v; end
-				request.callback(r.body, r.code, request);
+				request.callback(r.body, r.code, request, r);
 				request.callback = nil;
 			end
 			destroy_request(request);
@@ -148,7 +148,7 @@
 	req.handler, req.conn = server.wrapclient(conn, req.host, port, listener, "*a", using_https and { mode = "client", protocol = "sslv23" });
 	req.write = function (...) return req.handler:write(...); end
 	
-	req.callback = function (content, code, request) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request) end, handleerr)); end
+	req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end
 	req.reader = request_reader;
 	req.state = "status";