--- parser3/src/main/pa_request.C	2003/02/20 16:09:01	1.245.2.26
+++ parser3/src/main/pa_request.C	2003/03/06 16:15:25	1.245.2.30
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/02/20 16:09:01 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/03/06 16:15:25 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -16,6 +16,10 @@ static const char* IDENT_REQUEST_C="$Dat
 #include "pa_vint.h"
 #include "pa_vmethod_frame.h"
 #include "pa_types.h"
+#include "pa_venv.h"
+#include "pa_vmath.h"
+#include "pa_vstatus.h"
+#include "pa_vrequest.h"
 #include "pa_vtable.h"
 #include "pa_vfile.h"
 #include "pa_dictionary.h"
@@ -79,7 +83,7 @@ VHashPtr exception2vhash(Pool& pool, con
 
 //
 Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, 
-				 uchar adefault_lang, bool status_allowed):
+				 String_UL adefault_lang, bool status_allowed):
 	// private
 	fpool(apool),
 	anti_endless_execute_recoursion(0),
@@ -130,7 +134,7 @@ Request::Request(Pool& apool, SAPI_Info&
 	/// methodless
 	// env class
 	classes().put(StringPtr(new String(ENV_CLASS_NAME)), 
-			ValuePtr(new VEnv(asapi_info)));
+			ValuePtr(new VEnv(pool(), asapi_info)));
 	// status class
 	if(status_allowed)
 		classes().put(StringPtr(new String(STATUS_CLASS_NAME)), 
@@ -152,7 +156,7 @@ Request::Request(Pool& apool, SAPI_Info&
 	classes().put(mail->get_class()->base_class()->name(), mail);	
 	// math class
 	{
-		ValuePtr math(new VMail);
+		ValuePtr math(new VMath);
 		classes().put(math->get_class()->base_class()->name(), math);	
 	}
 }
@@ -161,7 +165,7 @@ Request::~Request() {
 #ifdef XML
 	// if for some strange reason xml generic errors failed to be reported, free them up
 	if(const char* xml_generic_errors=xmlGenericErrors()) {
-		SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors);
+		SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors);
 		free((void *)xml_generic_errors);
 	}
 #endif
@@ -677,3 +681,20 @@ StringPtr Request::mime_type_of(const ch
 bool Request::origins_mode() {
 	return main_class->get_element(origins_mode_name, *main_class, false)!=0;  // $ORIGINS mode
 }
+
+GdomeDOMString_auto_ptr Request::transcode(StringPtr s) {
+	return charsets.source().transcode(s);
+}
+
+StringPtr Request::transcode(GdomeDOMString* s
+#ifndef NO_STRING_ORIGIN
+	, StringPtr origin
+#endif
+	) {
+	return charsets.source().transcode(s
+#ifndef NO_STRING_ORIGIN
+		, origin
+#endif
+		);
+}
+