Merge 0.11->trunk

1 files changed, 12 insertions, 0 deletions

diff --git a/net/http.lua b/net/http.lua
index 17c755cf..f1055840 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -58,6 +58,16 @@ local function destroy_request(request)
 	end
 end
 
+local function cancel_request(request, reason)
+	if request.callback then
+		request.callback(reason or "cancelled", 0, request);
+		request.callback = nil;
+	end
+	if request.conn then
+		destroy_request(request);
+	end
+end
+
 local function request_reader(request, data, err)
 	if not request.parser then
 		local function error_cb(reason)
@@ -107,6 +117,7 @@ function listener.onconnect(conn)
 	end
 	req.reader = request_reader;
 	req.state = "status";
+	req.cancel = cancel_request;
 
 	requests[req.conn] = req;
 
@@ -318,4 +329,5 @@ return {
 	urldecode = util_http.urldecode;
 	formencode = util_http.formencode;
 	formdecode = util_http.formdecode;
+	destroy_request = destroy_request;
 };