Changeset

4700:63386138e393

mod_http_files: Return numeric error codes instead of custom error responses
author Matthew Wild <mwild1@gmail.com>
date Thu, 26 Apr 2012 06:10:14 +0100
parents 4699:c66179261551
children 4701:3ce9e1ca9c15
files plugins/mod_http_files.lua
diffstat 1 files changed, 4 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_http_files.lua	Thu Apr 26 05:58:39 2012 +0100
+++ b/plugins/mod_http_files.lua	Thu Apr 26 06:10:14 2012 +0100
@@ -14,10 +14,6 @@
 
 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 @@
 	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