--- parser3/src/main/pa_request.C	2003/04/03 15:34:02	1.245.2.37.2.27
+++ parser3/src/main/pa_request.C	2003/04/11 16:05:43	1.245.2.37.2.32
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/04/03 15:34:02 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/04/11 16:05:43 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -189,8 +189,11 @@ Request::~Request() {
 
 Value& Request::get_self() { return method_frame/*always have!*/->self(); }
 
-static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) {
-	::charsets.load_charset(*new String(akey, String::L_CLEAN), avalue->as_string());
+static void load_charset(HashStringValue::key_type akey, 
+			 HashStringValue::value_type avalue, 
+			 Request_charsets* charsets) {
+	const StringBody NAME=String(akey, String::L_CLEAN).change_case(charsets->source(), String::CC_UPPER);
+	::charsets.load_charset(*charsets, NAME, avalue->as_string());
 }
 void Request::configure_admin(VStateless_class& conf_class) {
 	if(configure_admin_done)
@@ -210,7 +213,7 @@ void Request::configure_admin(VStateless
 	if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) {
 		if(!vcharsets->is_string())
 			if(HashStringValue* charsets=vcharsets->get_hash())
-				charsets->for_each(load_charset, 0);
+				charsets->for_each(load_charset, &this->charsets);
 			else
 				throw Exception("parser.runtime",
 					0,
@@ -401,7 +404,7 @@ t[9]-t[3]
 						PA_ORIGIN_FILE_POS_FORMAT 
 						PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT,
 						request_info.uri,
-						file_list[origin.file_no], 1+origin.line, 1+origin.col,
+						file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col,
 						details.problem_source->cstr(),
 						e.comment(), e.type()
 					);
@@ -566,7 +569,7 @@ void Request::use_file(VStateless_class&
 		if(!entry_exists(*file_spec))
 			return;
 
-	if(const char* source=file_read_text(charsets.source(), *file_spec, fail_on_read_problem))
+	if(const char* source=file_read_text(charsets, *file_spec, fail_on_read_problem))
 		use_buf(aclass, source, main_alias, register_file(*file_spec));
 }
 
@@ -660,25 +663,19 @@ void Request::output_result(VFile* body_
 	// prepare header: $response:fields without :body
 	response.fields().for_each(add_header_attribute, this);
 
-	const void *client_body;
-	size_t client_content_length;
 	// transcode text body when "text/*" or simple result
 	if(body_file_content_type)
 		if(HashStringValue *hash=body_file_content_type->get_hash())
 			body_file_content_type=hash->get(value_name);
-	if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) {
-		Charset::transcode(
-			charsets.source(), body_file->value_ptr(), body_file->value_size(),
-			charsets.client(), client_body, client_content_length
-		);
-	} else {
-		client_body=body_file->value_ptr();
-		client_content_length=body_file->value_size();
-	}
+	String::C output(body_file->value_ptr(), body_file->value_size());
+	if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0)
+		output=Charset::transcode(output, 
+			charsets.source(), 
+			charsets.client());
 
 	// prepare header: content-length
 	char content_length_cstr[MAX_NUMBER];
-	snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length);
+	snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length);
 	SAPI::add_header_attribute(sapi_info, "content-length", content_length_cstr);
 
 	// send header
@@ -686,14 +683,15 @@ void Request::output_result(VFile* body_
 	
 	// send body
 	if(!header_only)
-		SAPI::send_body(sapi_info, client_body, client_content_length);
+		SAPI::send_body(sapi_info, output.str, output.length);
 }
 
 const String& Request::mime_type_of(const char* user_file_name_cstr) {
 	if(mime_types)
 		if(const char* cext=strrchr(user_file_name_cstr, '.')) {
 			String sext(++cext);
-			if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER)))
+			Table::Action_options options;
+			if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER), options))
 					if(const String* result=mime_types->item(1))
 						return *result;
 				else
@@ -778,5 +776,3 @@ Request::Exception_details Request::get_
 
 	return Request::Exception_details(trace, problem_source, vhash);
 }
-
-//
\ No newline at end of file