Merge with trunk

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 56dfe04efdb031522bdd7c9ce7b3280de08af07c..51dca1668a441c58418ae23815f41b41de191ed4 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -209,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,
@@ -230,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
@@ -252,13 +252,23 @@ function set_default_handler(handler)
        default_handler = handler;
 end
 
-function new_from_config(ports, default_base, handle_request)
+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, default_base, 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 default_base, 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
@@ -268,7 +278,9 @@ function new_from_config(ports, default_base, 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