Merge 0.6 with waqas

[prosody.git] / plugins / mod_httpserver.lua

diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index c5775ba30e867abc656827b4fdbc5ac1f00b0643..07c7f3154b4d08a92c7a00acfd8f7dc9ff1f6365 100644 (file)
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -15,6 +15,7 @@ local t_concat = table.concat;
 local http_base = config.get("*", "core", "http_path") or "www_files";
 
 local response_400 = { status = "400 Bad Request", body = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(" };
+local response_403 = { status = "403 Forbidden", body = "<h1>Forbidden</h1>You don't have permission to view the contents of this directory :(" };
 local response_404 = { status = "404 Not Found", body = "<h1>Page Not Found</h1>Sorry, we couldn't find what you were looking for :(" };
 
 -- TODO: Should we read this from /etc/mime.types if it exists? (startup time...?)
@@ -23,7 +24,7 @@ local mime_map = {
        htm = "text/html";
        xml = "text/xml";
        xsl = "text/xml";
-       txt = "plain/text; charset=utf-8";
+       txt = "text/plain; charset=utf-8";
        js = "text/javascript";
        css = "text/css";
 };
@@ -51,6 +52,9 @@ function serve_file(path)
        if not f then return response_404; end
        local data = f:read("*a");
        f:close();
+       if not data then
+               return response_403;
+       end
        local ext = path:match("%.([^.]*)$");
        local mime = mime_map[ext]; -- Content-Type should be nil when not known
        return {
@@ -72,6 +76,13 @@ local function handle_default_request(method, body, request)
        return serve_file(path);
 end
 
-local ports = config.get(module.host, "core", "http_ports") or { 5280 };
-httpserver.set_default_handler(handle_default_request);
-httpserver.new_from_config(ports, handle_file_request, { base = "files" });
+local function setup()
+       local ports = config.get(module.host, "core", "http_ports") or { 5280 };
+       httpserver.set_default_handler(handle_default_request);
+       httpserver.new_from_config(ports, handle_file_request, { base = "files" });
+end
+if prosody.start_time then -- already started
+       setup();
+else
+       prosody.events.add_handler("server-started", setup);
+end