diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-29 10:11:55 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-29 10:11:55 +0100 |
commit | 82bd1a5967eba247d95ddde8d8d77197b2bada91 (patch) | |
tree | c8d6f85995dc8549113fd74d2e095725531f60cb /plugins | |
parent | 60059d543ff5cb323d6c190a7e729404ad22aad4 (diff) | |
parent | accb25e18fd305ff306ed8f2af9e535c90dca607 (diff) | |
download | prosody-82bd1a5967eba247d95ddde8d8d77197b2bada91.tar.gz prosody-82bd1a5967eba247d95ddde8d8d77197b2bada91.zip |
Merge 0.9->trunk
Diffstat (limited to 'plugins')
-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 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 |