--- parser3/src/classes/file.C	2024/09/28 14:02:25	1.280
+++ parser3/src/classes/file.C	2024/11/04 03:53:25	1.285
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
@@ -19,6 +19,7 @@
 #include "pa_vdate.h"
 #include "pa_dir.h"
 #include "pa_vtable.h"
+#include "pa_varray.h"
 #include "pa_charset.h"
 #include "pa_charsets.h"
 #include "pa_sql_connection.h"
@@ -26,7 +27,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.280 2024/09/28 14:02:25 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.285 2024/11/04 03:53:25 moko Exp $";
 
 // defines
 
@@ -345,7 +346,7 @@ static void _create(Request& r, MethodPa
 			}
 			if(Value* vcharset_name=options->get(PA_CHARSET_NAME)) {
 				if(to_charset)
-					throw Exception(PARSER_RUNTIME, 0, "charset option can not be used with to-charset");
+					throw Exception(PARSER_RUNTIME, 0, "'charset' option cannot be used together with 'to-charset' option");
 				to_charset=&pa_charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
@@ -380,7 +381,7 @@ static void _create(Request& r, MethodPa
 		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");
+			throw Exception(PARSER_RUNTIME, 0, "charset options cannot be used with binary content");
 }
 
 static void _stat(Request& r, MethodParams& params) {
@@ -465,8 +466,7 @@ static void pass_cgi_header_attribute(
 }
 
 static void append_to_argv(Request& r, ArrayString& argv, const String* str){
-	if(!str->is_empty())
-		argv+=new String(str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS);
+	argv+=new String(str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS);
 }
 
 /// @todo fix `` in perl - they produced flipping consoles and no output to perl
@@ -500,7 +500,7 @@ static void _exec_cgi(Request& r, Method
 	ECSTR(QUERY_STRING, r.request_info.query_string);
 	ECSTR(REQUEST_URI, r.request_info.uri);
 	ECSTR(CONTENT_TYPE, r.request_info.content_type);
-	ECSTR(CONTENT_LENGTH, format(r.request_info.content_length, "%u"));
+	ECSTR(CONTENT_LENGTH, pa_uitoa(r.request_info.content_length));
 	// SCRIPT_*
 	env.put("SCRIPT_NAME", script_name);
 
@@ -545,18 +545,22 @@ static void _exec_cgi(Request& r, Method
 
 		for(size_t i=param_index; i<params.count(); i++) {
 			Value& param=params.as_no_junction(i, PARAM_MUST_NOT_BE_CODE);
-			if(param.is_defined()){
-				if(param.is_string()){
-					append_to_argv(r, argv, param.get_string());
-				} else {
-					Table* table=param.get_table();
-					if(table){
-						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");
+			if(const String *string=param.get_string()){
+				append_to_argv(r, argv, string);
+			} else if(Table* table=param.get_table()){
+				for(size_t j=0; j<table->count(); j++)
+					append_to_argv(r, argv, table->get(j)->get(0));
+			} else if(VArray* array=dynamic_cast<VArray*>(&param)){
+				for(ArrayValue::Iterator i(array->array()); i; i.next()){
+					if(i.value()){
+						const String *string=i.value()->get_string();
+						if(!string)
+							i.value()->bark("array element is '%s', it does not have string value");
+						append_to_argv(r, argv, string);
 					}
 				}
+			} else {
+				throw Exception(PARSER_RUNTIME, 0, "param must be string or table or array of strings");
 			}
 		}
 	}
@@ -1091,7 +1095,7 @@ static void _base64(Request& r, MethodPa
 
 			if(params.count() > 1) {
 				if(params.count() < 3)
-					throw Exception(PARSER_RUNTIME, 0, "constructor can not have less then 3 parameters (has %d parameters)", params.count()); // actually it accepts 1 parameter (backward)
+					throw Exception(PARSER_RUNTIME, 0, "constructor cannot have less than 3 parameters (has %d parameters)", params.count()); // actually it accepts 1 parameter (backward)
 
 				is_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_NOT_BE_CODE));
 				user_file_name=&params.as_string(1, FILE_NAME_MUST_BE_STRING);