aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_http_files.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-29 10:11:55 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-29 10:11:55 +0100
commit237fbdb8e53b39063c1df36d94f59695d80c2de2 (patch)
treec8d6f85995dc8549113fd74d2e095725531f60cb /plugins/mod_http_files.lua
parent9f3c9da2c265910b4878cf20d61be15bc033354f (diff)
parent701a556a1c92c521c03722c69493c37e33fa765d (diff)
downloadprosody-237fbdb8e53b39063c1df36d94f59695d80c2de2.tar.gz
prosody-237fbdb8e53b39063c1df36d94f59695d80c2de2.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_http_files.lua')
-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 59fd50aa..6ab295ac 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -32,7 +32,7 @@ if not mime_map then
jpeg = "image/jpeg", jpg = "image/jpeg",
svg = "image/svg+xml",
};
- module:shared("mime").types = mime_map;
+ module:shared("/*/http_files/mime").types = mime_map;
local mime_types, err = open(module:get_option_string("mime_types_file", "/etc/mime.types"),"r");
if mime_types then