aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-26 06:10:14 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-26 06:10:14 +0100
commiteb427566464aa721caa9a482d01f59e460de2f51 (patch)
treebbad9a2a7086b3881bbc2f7f2353629a2cd22d36
parent2444af151cabc8fdbfae9c3ed2b66eb10adde8ee (diff)
downloadprosody-eb427566464aa721caa9a482d01f59e460de2f51.tar.gz
prosody-eb427566464aa721caa9a482d01f59e460de2f51.zip
mod_http_files: Return numeric error codes instead of custom error responses
-rw-r--r--plugins/mod_http_files.lua16
1 files changed, 4 insertions, 12 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 437633e7..c5859283 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -14,10 +14,6 @@ local stat = lfs.attributes;
local http_base = module:get_option_string("http_path", "www_files");
-local response_400 = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(";
-local response_403 = "<h1>Forbidden</h1>You don't have permission to view the contents of this directory :(";
-local response_404 = "<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...?)
local mime_map = {
html = "text/html";
@@ -51,27 +47,23 @@ function serve_file(event, path)
local response = event.response;
path = path and preprocess_path(path);
if not path then
- response.status = 400;
- return response:send(response_400);
+ return 400;
end
local full_path = http_base..path;
if stat(full_path, "mode") == "directory" then
if stat(full_path.."/index.html", "mode") == "file" then
return serve_file(event, path.."/index.html");
end
- response.status = 403;
- return response:send(response_403);
+ return 403;
end
local f, err = open(full_path, "rb");
if not f then
- response.status = 404;
- return response:send(response_404.."<br/>"..tostring(err));
+ return 404;
end
local data = f:read("*a");
f:close();
if not data then
- response.status = 403;
- return response:send(response_403);
+ return 403;
end
local ext = path:match("%.([^.]*)$");
response.headers.content_type = mime_map[ext]; -- Content-Type should be nil when not known