--- parser3/src/include/pa_request.h	2020/11/10 22:42:25	1.256
+++ parser3/src/include/pa_request.h	2024/09/17 18:09:59	1.265
@@ -1,14 +1,14 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.256 2020/11/10 22:42:25 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.265 2024/09/17 18:09:59 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -19,6 +19,26 @@
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
 
+// defines for externs
+
+#define EXCEPTION_HANDLED_PART_NAME "handled"
+
+
+// externs
+
+extern const String main_method_name;
+extern const String auto_method_name;
+
+extern const String exception_type_part_name;
+extern const String exception_source_part_name;
+extern const String exception_comment_part_name;
+extern const String exception_handled_part_name;
+
+// defines for statics
+
+#define MAIN_CLASS_NAME "MAIN"
+#define AUTO_FILE_NAME "auto.p"
+
 // consts
 
 const size_t pseudo_file_no__process=1;
@@ -37,6 +57,7 @@ class VConsole;
 
 extern int pa_loop_limit;
 extern int pa_execute_recoursion_limit;
+extern int pa_httpd_timeout;
 extern size_t pa_file_size_limit;
 
 /// Main workhorse.
@@ -104,12 +125,14 @@ private:
 		element_type bottom_value() { return get(bottom_index()); }
 
 		void clear() {
-			fused=fbottom=0;
+			fsize=fbottom=0;
 		}
 
 		bool is_empty() {
-			return fused==fbottom;
+			return fsize==fbottom;
 		}
+
+		Table &table(Request &r);
 	};
 
 	///@{ core data
@@ -185,13 +208,15 @@ public:
 	/// global classes
 	HashString<VStateless_class*>& classes() { return fclasses; }
 	VStateless_class* get_class(const String& name);
+	VStateless_class& get_class_ref(const String& name);
 	void put_class(VStateless_class *aclass){ classes().put(aclass->type(), aclass); }
+	bool add_class(const char* atype, VStateless_class *aclass);
 
 	/**
 		core request processing
 		BEWARE: may throw exception to you: catch it!
 	*/
-	void core(const char* config_filespec, bool header_only);
+	void core(const char* config_filespec, bool header_only, const String& amain_method_name = main_method_name, const String* amain_class_name = NULL);
 
 	/// executes ops
 	void execute(ArrayOperation& ops); // execute.C
@@ -345,6 +370,7 @@ public: // status read methods
 
 	//{ for @conf[filespec] and @auto[filespec]
 	bool execute_method_if_exists(VStateless_class& aclass, const String& method_name, Value* optional_param);
+	bool execute_auto_method_if_exists(VStateless_class& aclass, const String& method_name, Value* optional_param);
 
 	//}
 
@@ -513,24 +539,4 @@ public:
 	~Temp_value_element();
 };
 
-// defines for externs
-
-#define EXCEPTION_HANDLED_PART_NAME "handled"
-
-
-// externs
-
-extern const String main_method_name;
-extern const String auto_method_name;
-
-extern const String exception_type_part_name;
-extern const String exception_source_part_name;
-extern const String exception_comment_part_name;
-extern const String exception_handled_part_name;
-
-// defines for statics
-
-#define MAIN_CLASS_NAME "MAIN"
-#define AUTO_FILE_NAME "auto.p"
-
 #endif