aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-17 23:14:03 +0100
committerKim Alvefur <zash@zash.se>2017-03-17 23:14:03 +0100
commit3b4130d49016ad983fdcf53931190d0ccdc176c2 (patch)
tree5b8b1f9e85e04567be99d8697a881b2aa1179bb0
parent6c23b9334dce0d75e72e5ead56d72b0e6acc9b5a (diff)
parentcf02edf36ed6b8b1234553fc54b8384e9db0be7e (diff)
downloadprosody-3b4130d49016ad983fdcf53931190d0ccdc176c2.tar.gz
prosody-3b4130d49016ad983fdcf53931190d0ccdc176c2.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_http_files.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index e396df60..b9a84cd3 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -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_path("mime_types_file", "/etc/mime.types", prosody.paths.config), "r");
+ local mime_types, err = open(module:get_option_path("mime_types_file", "/etc/mime.types", "config"), "r");
if mime_types then
local mime_data = mime_types:read("*a");
mime_types:close();