diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:08:58 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:08:58 +0100 |
commit | 6dced9f4823fd0353f3129df56b835cba6e82da6 (patch) | |
tree | 0604a6d66c0c755bf29a09127cce1c4ce854f6ac | |
parent | 76d4f07d2bca5b413c526fcec569abf16f5cd2f5 (diff) | |
download | prosody-6dced9f4823fd0353f3129df56b835cba6e82da6.tar.gz prosody-6dced9f4823fd0353f3129df56b835cba6e82da6.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.lua | 19 |
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); |