aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-18 00:08:58 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-18 00:08:58 +0100
commit8432300448438ac440333c9b371826ace1fd7e86 (patch)
tree0604a6d66c0c755bf29a09127cce1c4ce854f6ac
parent211f575c2a610071185f2732aa4f709eb37380ac (diff)
downloadprosody-8432300448438ac440333c9b371826ace1fd7e86.tar.gz
prosody-8432300448438ac440333c9b371826ace1fd7e86.zip
net.http: When HTTP request fails due to a network or SSL error, call the callback to let it know
-rw-r--r--net/http.lua19
1 files changed, 12 insertions, 7 deletions
diff --git a/net/http.lua b/net/http.lua
index 4eb4a2ac..639ecf6a 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -66,24 +66,29 @@ end
function listener.ondisconnect(conn, err)
local request = requests[conn];
if request and request.conn then
- request:reader(nil);
+ request:reader(nil, err);
end
requests[conn] = nil;
end
-local function request_reader(request, data)
+local function request_reader(request, data, err)
if not request.parser then
- if not data then return; end
- local function success_cb(r)
+ local function error_cb(reason)
if request.callback then
- request.callback(r.body, r.code, r, request);
+ request.callback(reason or "connection-closed", 0, request);
request.callback = nil;
end
destroy_request(request);
end
- local function error_cb(r)
+
+ if not data then
+ error_cb(err);
+ return;
+ end
+
+ local function success_cb(r)
if request.callback then
- request.callback(r or "connection-closed", 0, request);
+ request.callback(r.body, r.code, r, request);
request.callback = nil;
end
destroy_request(request);