diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-06-13 23:24:36 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-06-13 23:24:36 +0100 |
| commit | eb2837ec6dda62615b65af213847abaf859d752a (patch) | |
| tree | 79ee0e0fb16935e5bccc66437d2064837668f111 /plugins/mod_http_files.lua | |
| parent | ff224e953c0e4ca7ed515d59afb1f0d8db06298d (diff) | |
| parent | ee47583ffba1c0c823afbc0943951617356800e6 (diff) | |
| download | prosody-eb2837ec6dda62615b65af213847abaf859d752a.tar.gz prosody-eb2837ec6dda62615b65af213847abaf859d752a.zip | |
Merge the merge
Diffstat (limited to 'plugins/mod_http_files.lua')
| -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 915bec58..59fd50aa 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -19,7 +19,7 @@ local base_path = module:get_option_string("http_files_dir", module:get_option_s local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" }); local directory_index = module:get_option_boolean("http_dir_listing"); -local mime_map = module:shared("mime").types; +local mime_map = module:shared("/*/http_files/mime").types; if not mime_map then mime_map = { html = "text/html", htm = "text/html", |