# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1273231068 -18000
# Node ID e095d2a98936e8dc69a9eeb981521bf5d3758608
# Parent  f1e1b7629807dc4c5cf6ee605d588791c0ddad7e# Parent  b5beb7b15ac489363ec8b430158bf972479d9d68
Merge 0.6->0.7

diff -r f1e1b7629807 -r e095d2a98936 plugins/mod_console.lua
--- a/plugins/mod_console.lua	Fri May 07 16:13:05 2010 +0500
+++ b/plugins/mod_console.lua	Fri May 07 16:17:48 2010 +0500
@@ -85,9 +85,10 @@
 
 		session.env._ = data;
 		
-		local chunk, err = loadstring("return "..data);
+		local chunkname = "=console";
+		local chunk, err = loadstring("return "..data, chunkname);
 		if not chunk then
-			chunk, err = loadstring(data);
+			chunk, err = loadstring(data, chunkname);
 			if not chunk then
 				err = err:gsub("^%[string .-%]:%d+: ", "");
 				err = err:gsub("^:%d+: ", "");
diff -r f1e1b7629807 -r e095d2a98936 plugins/mod_posix.lua
--- a/plugins/mod_posix.lua	Fri May 07 16:13:05 2010 +0500
+++ b/plugins/mod_posix.lua	Fri May 07 16:17:48 2010 +0500
@@ -82,6 +82,7 @@
 	end
 	pidfile = module:get_option("pidfile");
 	if pidfile then
+		local err;
 		local mode = stat(pidfile) and "r+" or "w+";
 		pidfile_handle, err = io.open(pidfile, mode);
 		if not pidfile_handle then