--- parser3/src/classes/file.C	2016/08/01 22:30:20	1.245
+++ parser3/src/classes/file.C	2016/09/21 12:45:10	1.250
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.245 2016/08/01 22:30:20 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.250 2016/09/21 12:45:10 moko Exp $";
 
 // defines
 
@@ -365,9 +365,14 @@ static void _create(Request& r, MethodPa
 		self.set(true/*tainted*/, is_text, body.cstrm(), body.length(), file_name, vcontent_type, &r);
 	} else {
 		VFile& fcontent=*vcontent.as_vfile(String::L_AS_IS); // can't be null
-		if(is_text && !from_charset)
-			from_charset=fcontent.detect_binary_charset();
-		self.set(fcontent, mode != 0, is_text, file_name, vcontent_type, &r);
+		if(mode){
+			self.set(fcontent, &is_text, file_name, vcontent_type, &r);
+			if(is_text && !fcontent.is_text_mode())
+				from_charset=self.detect_binary_charset(from_charset);
+		} else {
+			self.set(fcontent, 0, file_name, vcontent_type, &r);
+			is_text=fcontent.is_text_mode();
+		}
 	}
 
 	if(to_charset || from_charset)
@@ -544,13 +549,10 @@ static void _exec_cgi(Request& r, Method
 				} else {
 					Table* table=param.get_table();
 					if(table){
-						for(size_t i=0; i<table->count(); i++) {
-							append_to_argv(r, argv, table->get(i)->get(0));
-						}
+						for(size_t j=0; j<table->count(); j++)
+							append_to_argv(r, argv, table->get(j)->get(0));
 					} else {
-						throw Exception(PARSER_RUNTIME,
-							0,
-							"param must be string or table");
+						throw Exception(PARSER_RUNTIME, 0, "param must be string or table");
 					}
 				}
 			}
@@ -647,8 +649,7 @@ static void _exec_cgi(Request& r, Method
 		// $fields << header
 		if(header) {
 			ArrayString rows;
-			size_t pos_after=0;
-			header->split(rows, pos_after, eol_marker);
+			header->split(rows, 0, eol_marker);
 			Pass_cgi_header_attribute_info info={0, 0, 0};
 			info.charset=&r.charsets.source();
 			info.fields=&self.fields();