Diff

plugins/mod_http_files.lua @ 5718:16db80c2b74d

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 29 Jun 2013 10:11:55 +0100
parent 5688:345761f0c2be
parent 5716:8a0465de172e
child 5776:bd0ff8ae98a8
line wrap: on
line diff
--- a/plugins/mod_http_files.lua	Wed Jun 26 21:40:33 2013 +0100
+++ b/plugins/mod_http_files.lua	Sat Jun 29 10:11:55 2013 +0100
@@ -32,7 +32,7 @@
 		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