diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-16 23:49:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-16 23:49:27 +0100 |
| commit | 3601968ff85a10f18f1dba92360aac7efabe09ad (patch) | |
| tree | 5d9e9dfec7020f862dc40a4b872556e3661b5327 /plugins/mod_http_files.lua | |
| parent | 33f73b5b885da18cef1b983cd1a1fe6d287e0391 (diff) | |
| parent | 4ce8edd6eb83eff68970077e9c3c99df19f5a955 (diff) | |
| download | prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.tar.gz prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_http_files.lua')
| -rw-r--r-- | plugins/mod_http_files.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index ab2f3966..e396df60 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -19,7 +19,7 @@ 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 cache_size = module:get_option_number("http_files_cache_size", 128); local cache_max_file_size = module:get_option_number("http_files_cache_max_file_size", 4096); -local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" }); +local dir_indices = module:get_option_array("http_index_files", { "index.html", "index.htm" }); local directory_index = module:get_option_boolean("http_dir_listing"); local mime_map = module:shared("/*/http_files/mime").types; @@ -37,7 +37,7 @@ if not mime_map then }; module:shared("/*/http_files/mime").types = mime_map; - local mime_types, err = open(module:get_option_string("mime_types_file", "/etc/mime.types"),"r"); + local mime_types, err = open(module:get_option_path("mime_types_file", "/etc/mime.types", prosody.paths.config), "r"); if mime_types then local mime_data = mime_types:read("*a"); mime_types:close(); |