Merge 0.9->trunk

diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 59fd50aaf630799568e1b50d81cd632003922a2e..6ab295acf3070c9d2312e72a1a2f15519fb56370 100644 (file)
--- 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

diff --git a/util-src/pposix.c b/util-src/pposix.c
index f5cc827032976c74c3ac624620b46aebb85c658a..e2cd142ef99c4bff536b1ea4c6856ef1a1af8946 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -500,6 +500,7 @@ int lc_setrlimit(lua_State *L) {
        if(arguments < 1 || arguments > 3) {
                lua_pushboolean(L, 0);
                lua_pushstring(L, "incorrect-arguments");
+               return 2;
        }
 
        resource = luaL_checkstring(L, 1);