moduleapi: in module:provides(), add the name of the module in item._provided_by

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 516afe58314ec3b0ae5d37f44667e3c5428f2f7a..3b783a41c89cefab692f0f29b4bf286065c98452 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -9,7 +9,7 @@
 local socket = require "socket"
 local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
-local httpstream_new = require "util.httpstream".new;
+local httpstream_new = require "net.http.parser".new;
 local util_http = require "util.http";
 
 local ssl_available = pcall(require, "ssl");
@@ -17,9 +17,9 @@ local ssl_available = pcall(require, "ssl");
 local server = require "net.server"
 
 local t_insert, t_concat = table.insert, table.concat;
-local pairs, ipairs = pairs, ipairs;
-local tonumber, tostring, xpcall, select, debug_traceback, char, format =
-      tonumber, tostring, xpcall, select, debug.traceback, string.char, string.format;
+local pairs = pairs;
+local tonumber, tostring, xpcall, select, traceback =
+      tonumber, tostring, xpcall, select, debug.traceback;
 
 local log = require "util.logger".init("http");
 
@@ -66,25 +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
-                               for k,v in pairs(r) do request[k] = v; end
-                               request.callback(r.body, r.code, request, r);
+                               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);
@@ -97,7 +101,7 @@ local function request_reader(request, data)
        request.parser:feed(data);
 end
 
-local function handleerr(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug_traceback()); end
+local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); end
 function request(u, ex, callback)
        local req = url.parse(u);