--- parser3/src/main/pa_request.C 2003/03/06 16:15:25 1.245.2.30 +++ parser3/src/main/pa_request.C 2003/03/08 16:37:19 1.245.2.34 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/03/06 16:15:25 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/03/08 16:37:19 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -26,6 +26,7 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_charset.h" #include "pa_charsets.h" #include "pa_cache_managers.h" +#include "pa_vmail.h" // consts @@ -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); } @@ -691,10 +694,22 @@ StringPtr Request::transcode(GdomeDOMStr , StringPtr origin #endif ) { - return charsets.source().transcode(s + return charsets.source().transcode(pool(), s #ifndef NO_STRING_ORIGIN , origin #endif ); } +StringPtr Request::transcode(xmlChar* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ) { + return charsets.source().transcode(pool(), s +#ifndef NO_STRING_ORIGIN + , origin +#endif + ); +} +#endif