Merge with 0.5

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 57c8eede01a9003e6bbd1579a190b0399e492662..56dfe04efdb031522bdd7c9ce7b3280de08af07c 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -61,7 +61,7 @@ local function send_response(request, response)
                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");
@@ -89,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
@@ -251,6 +248,10 @@ function new(params)
        end
 end
 
+function set_default_handler(handler)
+       default_handler = handler;
+end
+
 function new_from_config(ports, default_base, handle_request)
        for _, options in ipairs(ports) do
                local port, base, ssl, interface = 5280, default_base, false, nil;