--- parser3/src/classes/file.C	2015/01/12 12:13:25	1.232
+++ parser3/src/classes/file.C	2015/06/29 17:59:13	1.236
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.232 2015/01/12 12:13:25 misha Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.236 2015/06/29 17:59:13 moko Exp $";
 
 // defines
 
@@ -214,7 +214,7 @@ static void copy_process_source(
 static void copy_open_target(int f, void *from_spec) {
 	String& file_spec=*static_cast<String *>(from_spec);
 	file_read_action_under_lock(file_spec, "copy", copy_process_source, &f);
-};
+}
 
 static void _copy(Request& r, MethodParams& params) {
 	Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code");
@@ -387,7 +387,7 @@ static void _stat(Request& r, MethodPara
 static bool is_safe_env_key(const char* key) {
 	for(const char* validator=key; *validator; validator++) {
 		char c=*validator;
-		if(!(c>='A' && c<='Z' || c>='0' && c<='9' || c=='_' || c=='-'))
+		if(!( (c>='A' && c<='Z') || (c>='0' && c<='9') || (c=='_' || c=='-') ))
 			return false;
 	}
 #ifdef PA_SAFE_MODE
@@ -474,15 +474,12 @@ static void _exec_cgi(Request& r, Method
 			env.put( \
 				String::Body(#name), \
 				String::Body(*value_cstr?value_cstr:0)); \
-	// passing SAPI::environment
-	if(const char *const *pairs=SAPI::environment(r.sapi_info)) {
-		while(const char* pair=*pairs++)
-			if(const char* eq_at=strchr(pair, '='))
-				if(eq_at[1]) // has value
-					env.put(
-						pa_strdup(pair, eq_at-pair),
-						pa_strdup(eq_at+1));
-	}
+	// passing environment
+	for(SAPI::Env::Iterator i(r.sapi_info); i; i.next() )
+		env.put(
+			i.key(),
+			i.value()
+		);
 
 	// const
 	ECSTR(GATEWAY_INTERFACE, "CGI/1.1");
@@ -706,18 +703,19 @@ static void _list(Request& r, MethodPara
 			} else {
 				vfilter=&voption;
 			}
-			if(vfilter)
+			if(vfilter) {
 				if(Value* value=vfilter->as(VREGEX_TYPE)) {
 					vregex=static_cast<VRegex*>(value);
 				} else if(vfilter->is_string()) {
 					if(!vfilter->get_string()->trim().is_empty()) {
 						vregex=new VRegex(r.charsets.source(), &vfilter->as_string(), 0/*options*/);
-				vregex->study();
-				vrcleaner.vregex=vregex;
-			}
+						vregex->study();
+						vrcleaner.vregex=vregex;
+					}
 				} else {
 					throw Exception(PARSER_RUNTIME, 0, "filter must be regex or string");
 				}
+			}
 		}
 	}
 
@@ -736,9 +734,8 @@ static void _list(Request& r, MethodPara
 		if(!vregex || vregex->exec(ffblk.ff_name, file_name_size, ovector, ovector_size)>=0) {
 			Table::element_type row(new ArrayString);
 			*row+=new String(pa_strdup(file_name_cstr, file_name_size), String::L_TAINTED);
-			*row+=new String(String::Body::Format(ffblk.is_dir() ? 1 : 0), String::L_CLEAN);
+			*row+=new String(String::Body::Format(ffblk.is_dir(stat) ? 1 : 0), String::L_CLEAN);
 			if(stat) {
-				ffblk.stat_file();
 				*row+=VDouble(ffblk.size()).get_string();
 				*row+=new String(String::Body::Format((int)ffblk.c_timestamp()), String::L_CLEAN);
 				*row+=new String(String::Body::Format((int)ffblk.m_timestamp()), String::L_CLEAN);
@@ -758,11 +755,13 @@ struct Lock_execute_body_info {
 	Value* body_code;
 };
 #endif
+
 static void lock_execute_body(int , void *ainfo) {
 	Lock_execute_body_info& info=*static_cast<Lock_execute_body_info *>(ainfo);
 	// execute body
 	info.r->write_assign_lang(info.r->process(*info.body_code));
-};
+}
+
 static void _lock(Request& r, MethodParams& params) {
 	const String& file_spec=r.absolute(params.as_string(0, FILE_NAME_MUST_BE_STRING));
 	Lock_execute_body_info info={