# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1262381543 0
# Node ID 36b8de1bfa279f486535e3721c655e7c820fb181
# Parent  550dd0014575b36f020a0fc697b019b9cbbf2bcf
mod_httpserver: Rudimentary directory detection, return forbidden instead of causing a traceback (since commit 0325f241a26c)

diff -r 550dd0014575 -r 36b8de1bfa27 plugins/mod_httpserver.lua
--- a/plugins/mod_httpserver.lua	Fri Jan 01 03:32:26 2010 +0000
+++ b/plugins/mod_httpserver.lua	Fri Jan 01 21:32:23 2010 +0000
@@ -15,6 +15,7 @@
 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...?)
@@ -51,6 +52,9 @@
 	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 {