Merge with 0.5

diff --cc plugins/mod_httpserver.lua
index 73357f1be02526ea34c77500807a389eeba73900,f1f2150d1f816fb745b516b57573da5d1ebc6d58..72a4506abdcee6f78dc88e05f9a701900dd38962
--- 1/plugins/mod_httpserver.lua
--- 2/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@@ -11,40 -11,21 +11,21 @@@ local httpserver = require "net.httpser
  
  local open = io.open;
  local t_concat = table.concat;
- local check_http_path;
  
 -local http_base = "www_files";
 +local http_base = config.get("*", "core", "http_path") or "www_files";
  
- local response_403 = { status = "403 Forbidden", body = "<h1>Invalid URL</h1>Sorry, we couldn't find what you were looking for :(" };
+ local response_400 = { status = "400 Bad Request", body = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(" };
  local response_404 = { status = "404 Not Found", body = "<h1>Page Not Found</h1>Sorry, we couldn't find what you were looking for :(" };
  
- local http_path = { http_base };
- local function handle_request(method, body, request)
-       local path = check_http_path(request.url.path:gsub("^/[^/]+%.*", ""));
-       if not path then
-               return response_403;
+ local function preprocess_path(path)
+       if path:sub(1,1) ~= "/" then
+               path = "/"..path;
        end
-       http_path[2] = path;
-       local f, err = open(t_concat(http_path), "r");
-       if not f then return response_404; end
-       local data = f:read("*a");
-       f:close();
-       return data;
- end
- 
- local ports = config.get(module.host, "core", "http_ports") or { 5280 };
- httpserver.new_from_config(ports, "files", handle_request);
- 
- function check_http_path(url)
-       if url:sub(1,1) ~= "/" then
-               url = "/"..url;
-       end
-       
        local level = 0;
-       for part in url:gmatch("%/([^/]+)") do
-               if part == ".." then
+       for component in path:gmatch("([^/]+)/") do
+               if component == ".." then
                        level = level - 1;
-               elseif part ~= "." then
+               elseif component ~= "." then
                        level = level + 1;
                end
                if level < 0 then