--- parser3/src/classes/file.C 2024/09/28 14:37:53 1.281 +++ parser3/src/classes/file.C 2024/10/22 10:34:00 1.284 @@ -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.281 2024/09/28 14:37:53 moko Exp $"; +volatile const char * IDENT_FILE_C="$Id: file.C,v 1.284 2024/10/22 10:34:00 moko Exp $"; // defines @@ -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; icount(); 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; jcount(); j++) + append_to_argv(r, argv, table->get(j)->get(0)); + } else if(VArray* array=dynamic_cast(¶m)){ + 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"); } } }