# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1489788843 -3600
# Node ID 522099269b490e3853fda80f3ebbc8891d8e0065
# Parent  ae3c5abb3336cf3ec1f0a02804c37b2fdfd9b459# Parent  6521a51bb7182778ed5722ee75fa69c3fd99dfa5
Merge 0.10->trunk

diff -r ae3c5abb3336 -r 522099269b49 plugins/mod_http_files.lua
--- a/plugins/mod_http_files.lua	Fri Mar 17 13:08:31 2017 +0000
+++ b/plugins/mod_http_files.lua	Fri Mar 17 23:14:03 2017 +0100
@@ -37,7 +37,7 @@
 	};
 	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();