--- parser3/src/include/pa_request.h	2002/05/07 07:39:18	1.134
+++ parser3/src/include/pa_request.h	2002/06/12 14:09:49	1.138
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.h,v 1.134 2002/05/07 07:39:18 paf Exp $
+	$Id: pa_request.h,v 1.138 2002/06/12 14:09:49 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -81,7 +81,6 @@ public:
 		const char *content_type;
 		size_t content_length;
 		const char *cookie;
-		const char *user_agent;
 	};
 	
 	Request(Pool& apool,
@@ -100,10 +99,8 @@ public:
 		BEWARE: may throw exception to you: catch it!
 	*/
 	void core(
-		const char *root_config_filespec, ///< system config filespec
-		bool root_config_fail_on_read_problem, ///< fail if system config file not found
-		const char *site_config_filespec, ///< site config filespec
-		bool site_config_fail_on_read_problem, ///< fail if site config file not found
+		const char *config_filespec, ///< system config filespec
+		bool config_fail_on_read_problem, ///< fail if system config file not found
 		bool header_only);
 
 	/// executes ops
@@ -280,19 +277,27 @@ private: // core data
 	*/
 	uint anti_endless_execute_recoursion;
 
+private:
+
+	/// already executed some @conf method
+	bool configure_admin_done;
+
+	void configure_admin(VStateless_class& conf_class, const String *source);
+
 private: // compile.C
 
 	VStateless_class& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	const String *execute_method(Value& aself, const Method& method,
-		bool return_cstr);
+	void execute_method(Value& aself, const Method& method,
+		const String **return_string);
 	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
 	const String *execute_virtual_method(Value& aself, const String& method_name);
-	const String *execute_nonvirtual_method(VStateless_class& aclass, 
+	void execute_nonvirtual_method(VStateless_class& aclass, 
 		const String& method_name,
-		bool return_cstr);
+		const String **return_string,
+		const Method **return_method=0);
 
 	Value *get_element(const String *& remember_name, bool can_call_operator);