--- parser3/src/main/pa_request.C 2001/08/07 13:23:33 1.149 +++ parser3/src/main/pa_request.C 2001/10/03 12:20:58 1.166 @@ -2,15 +2,15 @@ Parser: request class main part. @see compile.C and execute.C. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_request.C,v 1.166 2001/10/03 12:20:58 parser Exp $ */ -static const char *RCSId="$Id: pa_request.C,v 1.149 2001/08/07 13:23:33 parser Exp $"; #include "pa_config_includes.h" -#include "pcre.h" -#include "internal.h" +//#include "pcre.h" +//#include "internal.h" extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c #include "pa_sapi.h" @@ -25,6 +25,7 @@ extern "C" unsigned char pcre_default_ta #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" +#include "pa_charset_manager.h" /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -35,6 +36,17 @@ const char *ORIGINS_CONTENT_TYPE="text/p Methoded *MOP_create(Pool&); +static void load_charset(const Hash::Key& akey, Hash::Val *avalue, + void *info) { + 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()); +} + // Request::Request(Pool& apool, Info& ainfo, @@ -48,6 +60,7 @@ 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), @@ -56,9 +69,8 @@ Request::Request(Pool& apool, mime_types(0), main_class(0), connection(0), - pcre_tables(0), classes_conf(apool), - anti_endless_execute_recoursion(0) + anti_endless_execute_recoursion(0) { /// directly used // operators @@ -86,65 +98,6 @@ Request::Request(Pool& apool, classes().put(math.get_class()->base()->name(), &math); } -static void element2ctypes(unsigned char *tables, - Value& ctype, const String& name, - unsigned char bit, - int group_offset=-1, - bool skip_ws=true) { - Value *value=ctype.get_element(name); - if(!value) - return; - - unsigned char *ctypes_table=tables+ctypes_offset; - const unsigned char *cstr= - (const unsigned char *)value->as_string().cstr(String::UL_AS_IS); - for(; *cstr; cstr++) { - unsigned char c=*cstr; - if(skip_ws && (c=='\n' || c=='\t' || c==' ')) - continue; - ctypes_table[c]|=bit; - - if(group_offset>=0) - tables[cbits_offset+group_offset+c/8] |= 1 << (c%8); - } -} -static void cstr2ctypes(unsigned char *tables, const unsigned char *cstr, - unsigned char bit) { - unsigned char *ctypes_table=tables+ctypes_offset; - ctypes_table[0]=bit; - for(; *cstr; cstr++) { - unsigned char c=*cstr; - ctypes_table[c]|=bit; - } -} -static void prepare_case_tables(unsigned char *tables) { - unsigned char *lcc_table=tables+lcc_offset; - unsigned char *fcc_table=tables+fcc_offset; - for(int i=0; i<0x100; i++) - lcc_table[i]=fcc_table[i]=i; -} -static void element2case(unsigned char *tables, Value& ctype, const String& name) { - Value *value=ctype.get_element(name); - if(!value) - return; - - unsigned char *lcc_table=tables+lcc_offset; - unsigned char *fcc_table=tables+fcc_offset; - const unsigned char *cstr= - (const unsigned char *)value->as_string().cstr(String::UL_AS_IS); - unsigned char from=0; - for(; *cstr; cstr++) { - unsigned char c=*cstr; - if(c=='\n' || c=='\t' || c==' ') - continue; - if(from) { - lcc_table[from]=c; - fcc_table[from]=c; fcc_table[c]=from; - from=0; - } else - from=c; - } -} /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -153,38 +106,53 @@ static void element2case(unsigned char * all located classes become children of one another, composing class we name 'MAIN' */ -void Request::core(const char *root_auto_path, bool root_auto_fail, - const char *site_auto_path, bool site_auto_fail, +void Request::core( + const char *root_config_filespec, bool root_config_fail_on_read_problem, + const char *site_config_filespec, bool site_config_fail_on_read_problem, bool header_only) { //_asm { int 3 } bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); - // loading root auto.p - if(root_auto_path) { + // loading root config + if(root_config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); - filespec.APPEND_CONST("/" AUTO_FILE_NAME); + filespec.APPEND_CLEAN(root_config_filespec, 0, "root_config", 0); main_class=use_file( filespec, - true/*ignore class_path*/, root_auto_fail, + true/*ignore class_path*/, root_config_fail_on_read_problem, main_class_name, main_class); } + if(main_class) { + /* $MAIN:CHARSETS[ + $.charsetname1[/full/path/to/charset/file.cfg] + ... + ] + */ + if(Value *vcharsets=main_class->get_element(*charsets_name)) { + if(Hash *charsets=vcharsets->get_hash()) + charsets->for_each(load_charset, &CTYPE); + else + THROW(0, 0, + &vcharsets->name(), + "must be hash"); + } + } + // configure root options // until someone with less privileges have overriden them OP.configure_admin(*this); methoded_array->configure_admin(*this); - // loading site auto.p - if(site_auto_path) { + // loading site config + if(site_config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); - filespec.APPEND_CONST("/" AUTO_FILE_NAME); + filespec.APPEND_CLEAN(site_config_filespec, 0, "site_config", 0); main_class=use_file( filespec, - true/*ignore class_path*/, site_auto_fail, + true/*ignore class_path*/, site_config_fail_on_read_problem, main_class_name, main_class); } @@ -192,7 +160,6 @@ void Request::core(const char *root_auto // to the one beside requested file. // all assigned bases from upper dir { - Array ladder(pool()); const char *after=info.path_translated; size_t drlen=strlen(info.document_root); if(memcmp(after, info.document_root, drlen)==0) { @@ -201,23 +168,21 @@ void Request::core(const char *root_auto --after; } + int step=0; while(const char *before=strchr(after, '/')) { - String& step=*NEW String(pool()); + String& sfile_spec=*NEW String(pool()); if(after!=info.path_translated) { - step.APPEND_CLEAN( - info.path_translated, before+1/* / */-info.path_translated, - "path-translated-scanned", ladder.size()); - step << AUTO_FILE_NAME; - ladder+=&step; + sfile_spec.APPEND_CLEAN( + info.path_translated, before-info.path_translated, + "path-translated-scanned", step++); + sfile_spec << "/" AUTO_FILE_NAME; + + main_class=use_file(sfile_spec, + true/*ignore class_path*/, false/*ignore read problem*/, + main_class_name, main_class); } after=before+1; } - for(int i=0; iget_element(*content_type_name):0; +#ifdef XML + // record default charset + if(default_content_type) + if(Hash *hash=default_content_type->get_hash()) + if(Value *vcharset=(Value *)hash->get(*charset_name)) + pool().set_charset(vcharset->as_string()); +#endif + if(Value *element=main_class->get_element(*user_html_name)) if(Table *table=element->get_table()) pool().set_tag(NEW Dictionary(*table)); @@ -245,41 +218,8 @@ void Request::core(const char *root_auto if(Table *table=element->get_table()) mime_types=table; - /* - $MAIN:CTYPE[ - $.white-space[ - ^#09^#0A^#0B^#0C^#0D^#20] - $.digit[ - 0123456789] - $.hex-digit[ - 0123456789ABCDEFabcdef] - $.letter[ - ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] - $.word[ - 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] - - $.lowercase[ - AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] - ] - */ - if(Value *ctype=main_class->get_element(*ctype_name)) { - // lowcase, flipcase, bits digit+word+whitespace, masks - pcre_tables=(unsigned char *)calloc(tables_length); - prepare_case_tables(pcre_tables); - - element2ctypes(pcre_tables, *ctype, *ctype_white_space_name, ctype_space, cbit_space, false); - element2ctypes(pcre_tables, *ctype, *ctype_digit_name, ctype_digit, cbit_digit); - element2ctypes(pcre_tables, *ctype, *ctype_hex_digit_name, ctype_xdigit); - element2ctypes(pcre_tables, *ctype, *ctype_letter_name, ctype_letter); - element2ctypes(pcre_tables, *ctype, *ctype_word_name, ctype_word, cbit_word); - cstr2ctypes(pcre_tables, (const unsigned char *)"*+?{^.$|()[", ctype_meta); - - element2case(pcre_tables, *ctype, *ctype_lowercase_name); - } else - pcre_tables=pcre_default_tables; - // filling form fields - form.fill_fields(*this); + form.fill_fields_and_tables(*this); // filling cookies cookie.fill_fields(*this); @@ -507,34 +447,36 @@ VStateless_class *Request::use_file(cons used_files.put(file_name, (Hash::Val *)true); const String *file_spec; - if(ignore_class_path || file_name.first_char()=='/') { - // ignore_class_path | absolute path, no need to scan MAIN:class_path + if(ignore_class_path) // ignore_class_path? file_spec=&file_name; - } else { - file_spec=0; - if(main_class) - if(Value *element=main_class->get_element(*class_path_name)) - 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); - String *test_file_spec=NEW String(path); - *test_file_spec << "/"; - *test_file_spec << file_name; - if(file_readable(*test_file_spec)) { - file_spec=test_file_spec; // found along class_path - break; - } - } - if(!file_spec) - THROW(0, 0, - &file_name, - "not found along " CLASS_PATH_NAME); + else if(file_name.first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH? + file_spec=&absolute(file_name); + else { + file_spec=0; + 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? + } 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)) + break; // found along class_path } - if(!file_spec) - THROW(0, 0, - &file_name, - "can not be found because no " CLASS_PATH_NAME " were specified"); + } else + THROW(0, 0, + &element->name(), + "must be string or table"); + if(!file_spec) + THROW(0, 0, + &file_name, + "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + } + if(!file_spec) + THROW(0, 0, + &file_name, + "usage failed - no " MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); @@ -649,3 +591,12 @@ 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; +}