diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-06-29 10:11:55 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-06-29 10:11:55 +0100 |
| commit | 237fbdb8e53b39063c1df36d94f59695d80c2de2 (patch) | |
| tree | c8d6f85995dc8549113fd74d2e095725531f60cb | |
| parent | 9f3c9da2c265910b4878cf20d61be15bc033354f (diff) | |
| parent | 701a556a1c92c521c03722c69493c37e33fa765d (diff) | |
| download | prosody-237fbdb8e53b39063c1df36d94f59695d80c2de2.tar.gz prosody-237fbdb8e53b39063c1df36d94f59695d80c2de2.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/mod_http_files.lua | 2 | ||||
| -rw-r--r-- | util-src/pposix.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 59fd50aa..6ab295ac 100644 --- 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 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); |