--- parser3/src/main/pa_request.C 2001/12/07 15:24:47 1.183 +++ parser3/src/main/pa_request.C 2001/12/21 12:47:56 1.188 @@ -4,13 +4,9 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_request.C,v 1.183 2001/12/07 15:24:47 paf Exp $ + $Id: pa_request.C,v 1.188 2001/12/21 12:47:56 paf Exp $ */ -#include "pa_config_includes.h" - -extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c - #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -23,8 +19,8 @@ extern "C" unsigned char pcre_default_ta #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" -#include "pa_charset_manager.h" -#include "pa_charset_connection.h" +#include "pa_charsets.h" +#include "pa_charset.h" /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -36,15 +32,12 @@ const char *ORIGINS_CONTENT_TYPE="text/p Methoded *MOP_create(Pool&); static void load_charset(const Hash::Key& akey, Hash::Val *avalue, - void *info) { + void *) { Value& value=*static_cast(avalue); - Hash& CTYPE=*static_cast(info); - - Charset_connection& connection= - charset_manager->get_connection(akey, value.as_string()); - // charset->pcre_tables - CTYPE.put(akey, connection.pcre_tables()); + if(!charsets->get(akey)) // don't we know that charset? + charsets->put(akey, + new(charsets->pool()) Charset(charsets->pool(), akey, &value.as_string())); } // @@ -62,7 +55,6 @@ Request::Request(Pool& apool, response(apool), cookie(apool), fclasses(apool), - CTYPE(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), post_data(0), post_size(0), @@ -78,6 +70,10 @@ Request::Request(Pool& apool, ,sql_connect_time(0),sql_request_time(0) #endif { + // default charsets + pool().set_source_charset(*utf8_charset); + pool().set_client_charset(*utf8_charset); + // maybe expire old caches cache_managers->maybe_expire(); @@ -144,7 +140,8 @@ gettimeofday(&mt[0],NULL); true/*ignore class_path*/, root_config_fail_on_read_problem, main_class_name, main_class); } - + // charsets must only be specified in root config + // so that users would not interfere if(main_class) { /* $MAIN:CHARSETS[ $.charsetname1[/full/path/to/charset/file.cfg] @@ -153,14 +150,13 @@ gettimeofday(&mt[0],NULL); */ if(Value *vcharsets=main_class->get_element(*charsets_name)) { if(Hash *charsets=vcharsets->get_hash(0)) - charsets->for_each(load_charset, &CTYPE); + charsets->for_each(load_charset); else throw Exception(0, 0, &vcharsets->name(), "must be hash"); } } - // configure root options // until someone with less privileges have overriden them OP.configure_admin(*this); @@ -216,17 +212,6 @@ gettimeofday(&mt[0],NULL); OP.configure_user(*this); methoded_array->configure_user(*this); - // $MAIN:DEFAULTS - Value *defaults=main_class->get_element(*defaults_name); - // value must be allocated on request's pool for that pool used on - // meaning constructing @see attributed_meaning_to_string - default_content_type=defaults?defaults->get_element(*content_type_name):0; - // record default charset - if(default_content_type) - if(Hash *hash=default_content_type->get_hash(0)) - if(Value *vcharset=(Value *)hash->get(*charset_name)) - pool().set_charset(vcharset->as_string()); - // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) @@ -269,7 +254,7 @@ gettimeofday(&mt[2],NULL); frame.store_param(method->name, &body_vstring_before_post_process); body_vstring_after_post_process= - NEW VString(*execute_method(frame, *method)); + NEW VString(execute_method(frame, *method)); } bool origins_mode=main_class->get_element(*origins_mode_name)!=0; @@ -442,7 +427,7 @@ t[9]-t[3] // future $response:body= // execute ^exception[origin;source;comment;type;code;stack] - body_string=execute_method(frame, *method); + body_string=&execute_method(frame, *method); } } @@ -514,12 +499,12 @@ VStateless_class *Request::use_file(cons if(main_class) if(Value *element=main_class->get_element(*class_path_name)) { if(element->is_string()) { - file_spec=file_readable(element->as_string(), file_name); // found at class_path? + file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { int size=table->size(); for(int i=size; i--; ) { const String& path=*static_cast(table->get(i))->get_string(0); - if(file_spec=file_readable(path, file_name)) + if(file_spec=file_readable(absolute(path), file_name)) break; // found along class_path } } else @@ -579,7 +564,8 @@ const String& Request::absolute(const St static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, void *info) { Request& r=*static_cast(info); - if(aattribute==*body_name) + if(aattribute==BODY_NAME + || aattribute==CHARSET_NAME) return; Value& lmeaning=*static_cast(ameaning); @@ -616,14 +602,18 @@ void Request::output_result(const VFile& // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, this); - // prepare... - const void *body=body_file.value_ptr(); - size_t content_length=body_file.value_size(); + // transcode + const void *client_body; + size_t client_content_length; + Charset::transcode(pool(), + pool().get_source_charset(), body_file.value_ptr(), body_file.value_size(), + pool().get_client_charset(), client_body, client_content_length + ); // prepare header: content-length - if(content_length) { // useful for redirecting [header "location: http://..."] + if(client_content_length) { // useful for redirecting [header "location: http://..."] char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); } @@ -632,7 +622,7 @@ void Request::output_result(const VFile& // send body if(!header_only) - SAPI::send_body(pool(), body, content_length); + SAPI::send_body(pool(), client_body, client_content_length); } const String& Request::mime_type_of(const char *user_file_name_cstr) { @@ -649,12 +639,3 @@ const String& Request::mime_type_of(cons } return *NEW String(pool(), "application/octet-stream"); } - -const unsigned char *Request::pcre_tables() { - if(unsigned char *result=(unsigned char *)CTYPE.get(pool().get_charset())) - return result; - - // this is not for pcre itself, - // it can do default, it's for string.lower&co - return pcre_default_tables; -}