diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-17 23:14:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-17 23:14:03 +0100 |
| commit | 29b64a45009858091f41e6443561299cac3416b8 (patch) | |
| tree | 5b8b1f9e85e04567be99d8697a881b2aa1179bb0 | |
| parent | 3f6b2ced44f52b65d774e5f1486c87e71f5ece36 (diff) | |
| parent | 0f64dd00ff74eadf0abe04bc48f15203e5c7a0da (diff) | |
| download | prosody-29b64a45009858091f41e6443561299cac3416b8.tar.gz prosody-29b64a45009858091f41e6443561299cac3416b8.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_http_files.lua | 2 |
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(); |