--- parser3/src/classes/file.C	2015/10/09 00:17:44	1.239
+++ parser3/src/classes/file.C	2016/09/08 20:41:47	1.249
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.239 2015/10/09 00:17:44 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.249 2016/09/08 20:41:47 moko Exp $";
 
 // defines
 
@@ -68,7 +68,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(file, new MFile, 0);
+DECLARE_CLASS_VAR(file, new MFile);
 
 // consts
 
@@ -133,7 +133,7 @@ static void _save(Request& r, MethodPara
 		if(HashStringValue* options=params.as_hash(2)){
 			int valid_options=0;
 			if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){
-				asked_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER));
+				asked_charset=&::charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
 			if(valid_options != options->count())
@@ -191,11 +191,7 @@ static void _move(Request& r, MethodPara
 		keep_empty_dirs);
 }
 
-static void copy_process_source(
-				struct stat& , 
-				int from_file, 
-				const String& , const char* /*fname*/, bool, 
-				void *context) {
+static void copy_process_source(struct stat& , int from_file, const String&, void *context) {
 	int& to_file=*static_cast<int *>(context);
 
 	int nCount=0;
@@ -322,7 +318,8 @@ static void _create(Request& r, MethodPa
 	}
 
 	VString* vcontent_type=0;
-	Charset* asked_charset=0;
+	Charset* to_charset=0;
+	Charset* from_charset=0;
 	if(params.count()>options_index)
 		if(HashStringValue* options=params.as_hash(options_index)) {
 			int valid_options=0;
@@ -337,8 +334,18 @@ static void _create(Request& r, MethodPa
 					valid_options++;
 				}
 			}
+			if(Value* vcharset_name=options->get("to-charset")) {
+				to_charset=&::charsets.get(vcharset_name->as_string());
+				valid_options++;
+			}
+			if(Value* vcharset_name=options->get("from-charset")) {
+				from_charset=&::charsets.get(vcharset_name->as_string());
+				valid_options++;
+			}
 			if(Value* vcharset_name=options->get(PA_CHARSET_NAME)) {
-				asked_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER));
+				if(to_charset)
+					throw Exception(PARSER_RUNTIME, 0, "charset option can not be used with to-charset");
+				to_charset=&::charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
 			if(Value* value=options->get(CONTENT_TYPE_NAME)) {
@@ -355,15 +362,24 @@ static void _create(Request& r, MethodPa
 
 	if(const String* content_str=vcontent.get_string()){
 		String::Body body=content_str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // explode content, honor tainting changes
-		if(asked_charset && is_text)
-			body=Charset::transcode(body, r.charsets.source(), *asked_charset);
 		self.set(true/*tainted*/, is_text, body.cstrm(), body.length(), file_name, vcontent_type, &r);
 	} else {
-		if(asked_charset)
-			throw Exception(PARSER_RUNTIME, 0, "charset option can not be used with file-content");
-		self.set(*vcontent.as_vfile(String::L_AS_IS), mode != 0, is_text, file_name, vcontent_type, &r);
+		VFile& fcontent=*vcontent.as_vfile(String::L_AS_IS); // can't be null
+		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)
+		if(is_text)
+			self.transcode(from_charset ? *from_charset : r.charsets.source(), to_charset ? *to_charset : r.charsets.source());
+		else
+			throw Exception(PARSER_RUNTIME, 0, "charset options can not be used with binary content");
 }
 
 static void _stat(Request& r, MethodParams& params) {
@@ -371,9 +387,7 @@ static void _stat(Request& r, MethodPara
 
 	size_t size;
 	time_t atime, mtime, ctime;
-	file_stat(r.absolute(lfile_name),
-		size,
-		atime, mtime, ctime);
+	file_stat(r.absolute(lfile_name), size, atime, mtime, ctime);
 	
 	VFile& self=GET_SELF(r, VFile);
 
@@ -486,8 +500,7 @@ static void _exec_cgi(Request& r, Method
 	ECSTR(CONTENT_TYPE, r.request_info.content_type);
 	ECSTR(CONTENT_LENGTH, format(r.request_info.content_length, "%u"));
 	// SCRIPT_*
-	env.put(String::Body("SCRIPT_NAME"), script_name);
-	//env.put(String::Body("SCRIPT_FILENAME"), ??&script_name);
+	env.put("SCRIPT_NAME", script_name);
 
 	// environment & stdin from param
 	String *in=new String();
@@ -496,8 +509,7 @@ static void _exec_cgi(Request& r, Method
 		if(HashStringValue* user_env=params.as_hash(param_index++, "env")) {
 			// $.charset  [previewing to handle URI pieces]
 			if(Value* vcharset=user_env->get(CHARSET_EXEC_PARAM_NAME))
-				charset=&charsets.get(vcharset->as_string()
-					.change_case(r.charsets.source(), String::CC_UPPER));
+				charset=&charsets.get(vcharset->as_string());
 
 			// $.others
 			Append_env_pair_info info={&r.charsets, &env, 0};
@@ -640,8 +652,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();
@@ -659,9 +670,7 @@ static void _exec_cgi(Request& r, Method
 	
 	// $stderr
 	if(!real_err->is_empty())
-		self.fields().put(
-			String::Body("stderr"),
-			new VString(*real_err));
+		self.fields().put("stderr", new VString(*real_err));
 }
 static void _exec(Request& r, MethodParams& params) {
 	_exec_cgi(r, params, false);
@@ -1115,11 +1124,7 @@ static void _crc32(Request& r, MethodPar
 }
 
 
-static void file_md5_file_action(
-				struct stat& finfo, 
-				int f, 
-				const String& , const char* /*fname*/, bool, 
-				void *context)
+static void file_md5_file_action(struct stat& finfo, int f, const String&, void *context)
 {
 	PA_MD5_CTX& md5context=*static_cast<PA_MD5_CTX *>(context);
 	if(finfo.st_size) {