--- parser3/src/main/pa_request.C	2003/03/08 15:45:17	1.245.2.32
+++ parser3/src/main/pa_request.C	2003/03/08 16:41:30	1.245.2.36
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/03/08 15:45:17 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/03/08 16:41:30 $";
 
 #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
@@ -682,11 +686,12 @@ 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);
 }
 
-#ifdef XML
 StringPtr Request::transcode(GdomeDOMString* s
 #ifndef NO_STRING_ORIGIN
 	, StringPtr origin
@@ -710,4 +715,4 @@ StringPtr Request::transcode(xmlChar* s
 #endif
 		);
 }
-#endif
\ No newline at end of file
+#endif