--- parser3/src/main/pa_request.C	2024/08/25 19:58:51	1.421
+++ parser3/src/main/pa_request.C	2024/11/04 03:53:25	1.429
@@ -1,7 +1,7 @@
 /** @file
 	Parser: request class main part. @see compile.C and execute.C.
 
-	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>
 */
 
@@ -33,8 +33,9 @@
 #include "pa_vmemory.h"
 #include "pa_vconsole.h"
 #include "pa_vdate.h"
+#include "pa_varray.h"
 
-volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.421 2024/08/25 19:58:51 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H;
+volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.429 2024/11/04 03:53:25 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H;
 
 // consts
 
@@ -43,8 +44,9 @@ volatile const char * IDENT_PA_REQUEST_C
 /// content type of response when no $MAIN:defaults.content-type defined
 const char* DEFAULT_CONTENT_TYPE="text/html";
 
-const uint LOOP_LIMIT=20000;
-const uint EXECUTE_RECOURSION_LIMIT=1000;
+const uint LOOP_LIMIT=100000;
+const uint ARRAY_LIMIT=1000000;
+const uint EXECUTE_RECURSION_LIMIT=1000;
 const uint HTTPD_TIMEOUT=4;
 const size_t FILE_SIZE_LIMIT=512*1024*1024;
 
@@ -76,7 +78,8 @@ const String exception_handled_part_name
 static const String origin_key(ORIGIN_KEY);
 
 int pa_loop_limit=LOOP_LIMIT;
-int pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT;
+int pa_array_limit=ARRAY_LIMIT;
+int pa_execute_recursion_limit=EXECUTE_RECURSION_LIMIT;
 int pa_httpd_timeout=HTTPD_TIMEOUT;
 size_t pa_file_size_limit=FILE_SIZE_LIMIT;
 
@@ -101,7 +104,8 @@ static const String getter_protected_nam
 static const String locals_name("LOCALS");
 static const String limits_name("LIMITS");
 static const String loop_limit_name("max_loop");
-static const String recoursion_limit_name("max_recoursion");
+static const String array_limit_name("max_array_size");
+static const String recursion_limit_name("max_recursion");
 static const String file_size_limit_name("max_file_size");
 static const String lock_wait_timeout_name("lock_wait_timeout");
 static const String httpd_name("HTTPD");
@@ -136,7 +140,7 @@ VStateless_class& VClassMAIN_create();
 //
 Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, String::Language adefault_lang):
 	// private
-	anti_endless_execute_recoursion(0),
+	anti_endless_execute_recursion(0),
 
 	// public
 	allow_class_replace(false),
@@ -245,6 +249,17 @@ VStateless_class& Request::get_class_ref
 	return *result;
 }
 
+bool Request::add_class(const char* atype, VStateless_class *aclass){
+	if(!allow_class_replace){
+		if(!classes().put_dont_replace(atype, aclass))
+			return true;
+		if(strcmp(atype, VARRAY_TYPE))
+			return false;
+	}
+	classes().put(atype, aclass);
+	return true;
+}
+
 static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, Request_charsets* charsets) {
 	pa_charsets.load_charset(*charsets, akey, avalue->as_string());
 }
@@ -328,17 +343,23 @@ void Request::configure_admin(VStateless
 		if(pa_loop_limit==0) pa_loop_limit=INT_MAX;
 	}, "LIMITS.%s must be int");
 
-	pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT;
-	CONF_OPTION(limits, recoursion_limit_name, {
-		pa_execute_recoursion_limit=option->as_int();
-		if(pa_execute_recoursion_limit==0) pa_execute_recoursion_limit=INT_MAX;
+	pa_array_limit=ARRAY_LIMIT;
+	CONF_OPTION(limits, array_limit_name, {
+		pa_array_limit=option->as_int();
+		if(pa_array_limit==0) pa_array_limit=INT_MAX;
+	}, "LIMITS.%s must be int");
+
+	pa_execute_recursion_limit=EXECUTE_RECURSION_LIMIT;
+	CONF_OPTION(limits, recursion_limit_name, {
+		pa_execute_recursion_limit=option->as_int();
+		if(pa_execute_recursion_limit==0) pa_execute_recursion_limit=INT_MAX;
 	}, "LIMITS.%s must be int");
 
 	pa_file_size_limit=FILE_SIZE_LIMIT;
 	CONF_OPTION(limits, file_size_limit_name, {
 		double limit=option->as_double();
 		if(limit >= (double)SSIZE_MAX)
-			throw Exception(PARSER_RUNTIME, 0, "$MAIN:LIMITS.%s must be less then %.15g", file_size_limit_name.cstr(), (double)SSIZE_MAX);
+			throw Exception(PARSER_RUNTIME, 0, "$MAIN:LIMITS.%s must be less than %.15g", file_size_limit_name.cstr(), (double)SSIZE_MAX);
 		pa_file_size_limit=(size_t)limit;
 		if(pa_file_size_limit==0)
 			pa_file_size_limit=SSIZE_MAX;
@@ -348,7 +369,7 @@ void Request::configure_admin(VStateless
 	CONF_OPTION(limits, lock_wait_timeout_name, {
 		double limit=option->as_double();
 		if(limit >= 3600*24)
-			throw Exception(PARSER_RUNTIME, 0, "$MAIN:LIMITS.%s must be less then %d", lock_wait_timeout_name.cstr(), 3600*24);
+			throw Exception(PARSER_RUNTIME, 0, "$MAIN:LIMITS.%s must be less than %d", lock_wait_timeout_name.cstr(), 3600*24);
 		pa_lock_attempts=(unsigned int)(limit*2)+1;
 	}, "LIMITS.%s must be number");
 
@@ -428,8 +449,8 @@ Table &Request::Exception_trace::table(R
 			Operation::Origin origin=trace.origin();
 			if(origin.file_no) {
 				*row+=new String(r.file_list[origin.file_no], String::L_TAINTED); // 'file' column
-				*row+=new String(String::Body::Format(1+origin.line), String::L_CLEAN); // 'lineno' column
-				*row+=new String(String::Body::Format(1+origin.col), String::L_CLEAN); // 'colno' column
+				*row+=new String(pa_uitoa(1+origin.line), String::L_CLEAN); // 'lineno' column
+				*row+=new String(pa_uitoa(1+origin.col), String::L_CLEAN); // 'colno' column
 			}
 			stack_trace+=row;
 		}
@@ -758,7 +779,7 @@ static void output_sole_piece(Request& r
 		output=Charset::transcode(output, r.charsets.source(), r.charsets.client());
 
 	// prepare header: Content-Length
-	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u"));
+	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, pa_uitoa(output.length));
 
 	// send header
 	SAPI::send_header(r.sapi_info);
@@ -890,7 +911,7 @@ static void output_pieces(Request& r, bo
 		}
 	}
 
-	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format((double)part_length, "%.15g"));
+	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, pa_uitoa(part_length));
 
 	if(add_last_modified)
 		SAPI::add_header_attribute(r.sapi_info, "last-modified", attributed_meaning_to_string(date, String::L_AS_IS, true).cstr());
@@ -959,9 +980,8 @@ void Request::output_result(VFile* body_
 
 		VDate* vdate=0;
 		if(Value* v=body_file->fields().get("mdate")) {
-			if(Value* vdatep=v->as(VDATE_TYPE))
-				vdate=static_cast<VDate*>(vdatep);
-			else 
+			vdate=dynamic_cast<VDate*>(v);
+			if(!vdate)
 				throw Exception(PARSER_RUNTIME, 0, "mdate must be a date");
 		}
 		if(!vdate)