# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1372497115 -3600
# Node ID 16db80c2b74d9ad3a4f19a09cb61cf2d130195f0
# Parent  ce9818e48ebb25edcdb5d7ee020babb63229c59e# Parent  bf98912a4f5b1397a2f92191f8b8bcbb77dd59ed
Merge 0.9->trunk

diff -r ce9818e48ebb -r 16db80c2b74d plugins/mod_http_files.lua
--- 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
diff -r ce9818e48ebb -r 16db80c2b74d util-src/pposix.c
--- a/util-src/pposix.c	Wed Jun 26 21:40:33 2013 +0100
+++ b/util-src/pposix.c	Sat Jun 29 10:11:55 2013 +0100
@@ -500,6 +500,7 @@
 	if(arguments < 1 || arguments > 3) {
 		lua_pushboolean(L, 0);
 		lua_pushstring(L, "incorrect-arguments");
+		return 2;
 	}
 
 	resource = luaL_checkstring(L, 1);