From fdacf5cb34c305af583c1c9d1b2b36421ace1a10 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 28 Jun 2013 19:34:57 +0200 Subject: mod_http_files: Put the MIME type map in a global shared table instead of per-host --- plugins/mod_http_files.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 915bec58..6ab295ac 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -19,7 +19,7 @@ local base_path = module:get_option_string("http_files_dir", module:get_option_s local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" }); local directory_index = module:get_option_boolean("http_dir_listing"); -local mime_map = module:shared("mime").types; +local mime_map = module:shared("/*/http_files/mime").types; if not mime_map then mime_map = { html = "text/html", htm = "text/html", @@ -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 -- cgit v1.2.3 From accb25e18fd305ff306ed8f2af9e535c90dca607 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 28 Jun 2013 20:16:43 +0100 Subject: util.pposix: setrlimit(): Add missing return on error when an incorrect number of arguments are passed --- util-src/pposix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util-src/pposix.c b/util-src/pposix.c index f5cc8270..e2cd142e 100644 --- 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); -- cgit v1.2.3