Merge with trunk

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 77cc5b981ad5a5016767401f3013fa3b6ba5c0f6..51dca1668a441c58418ae23815f41b41de191ed4 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -37,6 +37,7 @@ local function send_response(request, response)
        -- Write status line
        local resp;
        if response.body then
+               local body = tostring(response.body);
                log("debug", "Sending response to %s", request.id);
                resp = { "HTTP/1.0 ", response.status or "200 OK", "\r\n"};
                local h = response.headers;
@@ -48,19 +49,19 @@ local function send_response(request, response)
                                t_insert(resp, "\r\n");
                        end
                end
-               if response.body and not (h and h["Content-Length"]) then
+               if not (h and h["Content-Length"]) then
                        t_insert(resp, "Content-Length: ");
-                       t_insert(resp, #response.body);
+                       t_insert(resp, #body);
                        t_insert(resp, "\r\n");
                end
                t_insert(resp, "\r\n");
                
-               if response.body and request.method ~= "HEAD" then
-                       t_insert(resp, response.body);
+               if request.method ~= "HEAD" then
+                       t_insert(resp, body);
                end
        else
                -- Response we have is just a string (the body)
-               log("debug", "Sending response to %s: %s", request.id or "<none>", response or "<none>");
+               log("debug", "Sending 200 response to %s", request.id or "<none>");
                
                resp = { "HTTP/1.0 200 OK\r\n" };
                t_insert(resp, "Connection: close\r\n");
@@ -88,9 +89,6 @@ local function call_callback(request, err)
                end
                
                callback = (request.server and request.server.handlers[base]) or default_handler;
-               if callback == default_handler then
-                       log("debug", "Default callback for this request (base: "..tostring(base)..")")
-               end
        end
        if callback then
                if err then
@@ -105,7 +103,7 @@ local function call_callback(request, err)
                if response then
                        if response == true and not request.destroyed then
                                -- Keep connection open, we will reply later
-                               log("warn", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
+                               log("debug", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
                        elseif response ~= true then
                                -- Assume response
                                send_response(request, response);
@@ -211,7 +209,7 @@ end
 
 function new_request(handler)
        return { handler = handler, conn = handler.socket, 
-                       write = handler.write, state = "request", 
+                       write = function (...) return handler:write(...); end, state = "request", 
                        server = http_servers[handler.serverport()],
                        send = send_response,
                        destroy = destroy_request,
@@ -232,7 +230,7 @@ function destroy_request(request)
                end
                request.handler.close()
                if request.conn then
-                       listener.disconnect(request.conn, "closed");
+                       listener.ondisconnect(request.handler, "closed");
                end
        end
 end
@@ -250,13 +248,27 @@ function new(params)
        end
 end
 
-function new_from_config(ports, handle_request)
+function set_default_handler(handler)
+       default_handler = handler;
+end
+
+function new_from_config(ports, handle_request, default_options)
+       if type(handle_request) == "string" then -- COMPAT with old plugins
+               log("warn", "Old syntax of httpserver.new_from_config being used to register %s", handle_request);
+               handle_request, default_options = default_options, { base = handle_request };
+       end
        for _, options in ipairs(ports) do
-               local port, base, ssl, interface = 5280, "http-bind", false, nil;
+               local port = default_options.port or 5280;
+               local base = default_options.base;
+               local ssl = default_options.ssl or false;
+               local interface = default_options.interface;
                if type(options) == "number" then
                        port = options;
                elseif type(options) == "table" then
-                       port, base, ssl, interface = options.port or 5280, options.path or "http-bind", options.ssl or false, options.interface;
+                       port = options.port or port;
+                       base = options.path or base;
+                       ssl = options.ssl or ssl;
+                       interface = options.interface or interface;
                elseif type(options) == "string" then
                        base = options;
                end
@@ -266,7 +278,9 @@ function new_from_config(ports, handle_request)
                        ssl.protocol = "sslv23";
                end
                
-               new{ port = port, base = base, handler = handle_request, ssl = ssl, type = (ssl and "ssl") or "tcp" }
+               new{ port = port, interface = interface, 
+                       base = base, handler = handle_request, 
+                       ssl = ssl, type = (ssl and "ssl") or "tcp" };
        end
 end