From 23e05cc038ce41fb538d3e9c2d096f1cf914af51 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 26 Apr 2012 06:10:14 +0100 Subject: mod_http_files: Return numeric error codes instead of custom error responses --- plugins/mod_http_files.lua | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'plugins') 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 = "

Bad Request

Sorry, we didn't understand your request :("; -local response_403 = "

Forbidden

You don't have permission to view the contents of this directory :("; -local response_404 = "

Page Not Found

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.."
"..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 -- cgit v1.2.3