--- parser3/src/main/pa_request.C	2003/02/14 16:52:21	1.245.2.16
+++ parser3/src/main/pa_request.C	2003/02/17 16:44:57	1.245.2.24
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/02/14 16:52:21 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/02/17 16:44:57 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -54,7 +54,6 @@ StringPtr body_name(new String(BODY_NAME
 #define CHARSETS_NAME "CHARSETS"
 #define MIME_TYPES_NAME "MIME-TYPES"
 #define ORIGINS_MODE_NAME "ORIGINS"
-#define AUTO_FILE_NAME "auto.p"
 #define CONF_METHOD_NAME "conf"
 #define POST_PROCESS_METHOD_NAME "postprocess"
 #define DOWNLOAD_NAME "download"
@@ -78,25 +77,45 @@ VStateless_classPtr VClassMAIN_create();
 // op.C
 VHashPtr exception2vhash(Pool& pool, const Exception& e);
 
-void lock_system_class(HashStringValue::key_type key, HashStringValue::value_type value, int) {
-	if(VStateless_class *value_class=value->get_class())
-		value_class->lock();
-}
-
 //
-Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, 
+Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, 
 				 uchar adefault_lang, bool status_allowed):
+	// private
+	fpool(apool),
+	anti_endless_execute_recoursion(0),
+
+	// public
+	method_frame(0),
+	rcontext(0),
+	wcontext(0),
+	flang(adefault_lang),
+	fconnection(0),
+	finterrupted(false),
+
+	// public
+#ifdef RESOURCES_DEBUG
+	sql_connect_time(0),
+	sql_request_time(0),
+#endif	
+
+	// public
 	sapi_info(asapi_info),
 	request_info(arequest_info),
-	fdefault_lang(adefault_lang), flang(adefault_lang),
-
-	main_class(VClassMAIN_create()),
 	charsets(pool(), *UTF8_charset, *UTF8_charset, *UTF8_charset), // default charsets
 
-	response(new VResponse(fpool, arequest_info, charsets)),
+	main_class(VClassMAIN_create()),
 	form(new VForm),
 	mail(new VMail),
-	cookie(new VCookie)
+	response(new VResponse(fpool, arequest_info, charsets)),
+	cookie(new VCookie),
+
+	// private
+	configure_admin_done(false),
+
+	// private defaults
+	fdefault_lang(adefault_lang), 
+	// private mime types
+	mime_types(0)
 {
 	// maybe expire old caches
 	cache_managers.maybe_expire();
@@ -106,7 +125,7 @@ Request::Request(SAPI_Info& asapi_info,
 	classes().put(main_class->name(), main_class);
 	// classes:
 	// table, file, random, mail, image, ...
-	methoded_array.register_directly_used(*this);
+	methoded_array().register_directly_used(*this);
 
 	/// methodless
 	// env class
@@ -136,10 +155,6 @@ Request::Request(SAPI_Info& asapi_info,
 		ValuePtr math(new VMail);
 		classes().put(math->get_class()->base_class()->name(), math);	
 	}
-
-	// prevent system classes from modification [calling add_method]
-	// ^process[$string:CLASS]{@method} prohibited from now on...
-	classes().for_each(lock_system_class, 0);
 }
 
 Request::~Request() {
@@ -184,7 +199,7 @@ void Request::configure_admin(VStateless
 
 	// configure method_frame options
 	//	until someone with less privileges have overriden them
-	methoded_array.configure_admin(*this);
+	methoded_array().configure_admin(*this);
 }
 
 /**
@@ -209,8 +224,6 @@ struct timeval mt[10];
 gettimeofday(&mt[0],NULL);
 #endif
 	try {
-		char *auto_filespec=(char *)malloc(MAX_STRING);
-		
 		// loading config
 		if(config_filespec) {
 			StringPtr filespec(new String);
@@ -261,7 +274,7 @@ gettimeofday(&mt[0],NULL);
 			configure_admin(*main_class, StringPtr(0));
 
 		// configure not-method_frame=user options
-		methoded_array.configure_user(*this);
+		methoded_array().configure_user(*this);
 
 		// $MAIN:MIME-TYPES
 		if(ValuePtr element=main_class->get_element(mime_types_name, *main_class, false))
@@ -301,7 +314,7 @@ gettimeofday(&mt[2],NULL);
 				if(const Method *method=junction->method) {
 					// preparing to pass parameters to 
 					//	@postprocess[data]
-					VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/);
+					VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); frame.ref();
 					frame.set_self(main_class);
 
 					frame.store_param(body_vstring_before_post_process);
@@ -399,13 +412,13 @@ t[9]-t[3]
 					if(const Method *method=junction->method) {
 		 				// preparing to pass parameters to 
 						//	@unhandled_exception[exception;stack]
-						VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/);
+						VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/); frame.ref();
 						frame.set_self(main_class);
 
 						// $exception
 						frame.store_param(exception2vhash(pool(), e));
 						// $stack[^table::set{name	origin}]
-						Table::columns_type stack_trace_columns;
+						Table::columns_type stack_trace_columns(new ArrayString);
 						*stack_trace_columns+=StringPtr(new String("name"));
 						*stack_trace_columns+=StringPtr(new String("file"));
 						*stack_trace_columns+=StringPtr(new String("lineno"));
@@ -494,12 +507,12 @@ VStateless_classPtr Request::use_file(VS
 		file_spec=StringPtr(0);
 		if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) {
 			if(element->is_string()) {
-				file_spec=file_readable(absolute(element->as_string(&pool())), file_name); // found at class_path?
+				file_spec=file_readable(*absolute(element->as_string(&pool())), *file_name); // found at class_path?
 			} else if(Table *table=element->get_table()) {
 				int size=table->count();
 				for(int i=size; i--; ) {
 					StringPtr path=(*table->get(i))[0];
-					if(file_spec=file_readable(absolute(path), file_name))
+					if(file_spec=file_readable(*absolute(path), *file_name))
 						break; // found along class_path
 				}
 			} else
@@ -551,7 +564,7 @@ VStateless_classPtr Request::use_buf(VSt
 	// locate and execute possible @auto[] static
 	execute_nonvirtual_method(cclass, 
 		auto_method_name, vfilespec,
-		0/*no result needed*/);
+		false/*no result needed*/);
 	return VStateless_classPtr(&cclass);
 }