prosody
16db80c2b74d

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

5718:16db80c2b74d

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 29 Jun 2013 10:11:55 +0100
parents 5715:ce9818e48ebb (current diff) 5717:bf98912a4f5b (diff)
children 5720:449399a7e136
files plugins/mod_http_files.lua
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
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
--- 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);