--- parser3/src/main/pa_request.C	2003/03/07 14:56:59	1.245.2.31
+++ parser3/src/main/pa_request.C	2003/03/13 11:46:18	1.245.2.37
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/03/07 14:56:59 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/03/13 11:46:18 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -26,6 +26,10 @@ static const char* IDENT_REQUEST_C="$Dat
 #include "pa_charset.h"
 #include "pa_charsets.h"
 #include "pa_cache_managers.h"
+#include "pa_vmail.h"
+#include "pa_vform.h"
+#include "pa_vcookie.h"
+#include "pa_vresponse.h"
 
 // consts
 
@@ -292,7 +296,7 @@ gettimeofday(&mt[0],NULL);
 		cookie->fill_fields(pool(), request_info);
 
 		// filling mail received
-		mail->fill_received(pool(), request_info);
+		mail->fill_received(*this);
 
 #ifdef RESOURCES_DEBUG
 //measure:after compile
@@ -494,12 +498,12 @@ t[9]-t[3]
 	}
 }
 
-VStateless_classPtr Request::use_file(VStateless_class& aclass,
+void Request::use_file(VStateless_class& aclass,
 									StringPtr file_name, bool ignore_class_path, 
 									bool fail_on_read_problem, bool fail_on_file_absence) {
 	// cyclic dependence check
 	if(used_files.get(file_name))
-		return VStateless_classPtr(0);
+		return;
 	used_files.put(file_name, true);
 
 	StringPtr file_spec;
@@ -536,16 +540,14 @@ VStateless_classPtr Request::use_file(VS
 
 	if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for
 		if(!entry_exists(file_spec))
-			return VStateless_classPtr(0);
+			return;
 
 	if(const char *source=file_read_text(pool(), charsets.source(), file_spec, fail_on_read_problem))
-		return use_buf(aclass, source, file_spec, file_spec->cstr(pool()));
-	else
-		return VStateless_classPtr(0);
+		use_buf(aclass, source, file_spec, file_spec->cstr(pool()));
 }
 
 
-VStateless_classPtr Request::use_buf(VStateless_class& aclass,
+void Request::use_buf(VStateless_class& aclass,
 								   const char* source, 
 								   StringPtr filespec, const char* filespec_cstr) {
 	// temporary zero @conf so to maybe-replace it in compiled code
@@ -568,7 +570,6 @@ VStateless_classPtr Request::use_buf(VSt
 	execute_nonvirtual_method(cclass, 
 		auto_method_name, vfilespec,
 		false/*no result needed*/);
-	return VStateless_classPtr(&cclass);
 }
 
 StringPtr Request::relative(const char* apath, StringPtr relative_name) {
@@ -682,6 +683,8 @@ bool Request::origins_mode() {
 	return main_class->get_element(origins_mode_name, *main_class, false)!=0;  // $ORIGINS mode
 }
 
+#ifdef XML
+
 GdomeDOMString_auto_ptr Request::transcode(StringPtr s) {
 	return charsets.source().transcode(s);
 }
@@ -709,3 +712,4 @@ StringPtr Request::transcode(xmlChar* s
 #endif
 		);
 }
+#endif