# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1394405273 -3600
# Node ID 8796aa94c4b5b06af0bc0a4a9ab4fab6636d5fb1
# Parent  8c69cea8a1bfd34cfdc327e6e6d9cb8f39bc5295# Parent  9b91242cc13791b2b93a54684e8ac69a468c346e
Merge 0.9->0.10

diff -r 8c69cea8a1bf -r 8796aa94c4b5 plugins/mod_http_files.lua
--- a/plugins/mod_http_files.lua	Wed Feb 26 22:21:55 2014 +0100
+++ b/plugins/mod_http_files.lua	Sun Mar 09 23:47:53 2014 +0100
@@ -14,6 +14,7 @@
 local open = io.open;
 local stat = lfs.attributes;
 local build_path = require"socket.url".build_path;
+local path_sep = package.config:sub(1,1);
 
 local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path"));
 local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" });
@@ -61,7 +62,7 @@
 		local request, response = event.request, event.response;
 		local orig_path = request.path;
 		local full_path = base_path .. (path and "/"..path or "");
-		local attr = stat(full_path);
+		local attr = stat((full_path:gsub('%'..path_sep..'+$','')));
 		if not attr then
 			return 404;
 		end
diff -r 8c69cea8a1bf -r 8796aa94c4b5 util/pluginloader.lua
--- a/util/pluginloader.lua	Wed Feb 26 22:21:55 2014 +0100
+++ b/util/pluginloader.lua	Sun Mar 09 23:47:53 2014 +0100
@@ -39,10 +39,10 @@
 	resource = resource or "mod_"..plugin..".lua";
 
 	local names = {
-		"mod_"..plugin.."/"..plugin.."/"..resource; -- mod_hello/hello/mod_hello.lua
-		"mod_"..plugin.."/"..resource;              -- mod_hello/mod_hello.lua
-		plugin.."/"..resource;                      -- hello/mod_hello.lua
-		resource;                                   -- mod_hello.lua
+		"mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
+		"mod_"..plugin..dir_sep..resource;                  -- mod_hello/mod_hello.lua
+		plugin..dir_sep..resource;                          -- hello/mod_hello.lua
+		resource;                                           -- mod_hello.lua
 	};
 
 	return load_file(names);