--- parser3/src/main/pa_request.C 2001/04/19 11:57:00 1.115 +++ parser3/src/main/pa_request.C 2001/04/27 15:19:30 1.122.2.1 @@ -5,31 +5,25 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.115 2001/04/19 11:57:00 paf Exp $ + $Id: pa_request.C,v 1.122.2.1 2001/04/27 15:19:30 paf Exp $ */ #include "pa_config_includes.h" -#include +#include "pcre.h" +#include "internal.h" #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" #include "pa_wwrapper.h" #include "pa_vclass.h" -#include "_op.h" -#include "_table.h" -#include "_file.h" #include "pa_globals.h" #include "pa_vint.h" #include "pa_vmethod_frame.h" #include "pa_types.h" #include "pa_vtable.h" -#include "_random.h" #include "pa_vfile.h" -#include "_mail.h" -#include "_exec.h" -#include "_image.h" /// $LIMITS.post_max_size default 10M const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; @@ -40,12 +34,14 @@ const char *UNHANDLED_EXCEPTION_CONTENT_ /// content type of response when no $MAIN:defaults.content-type defined const char *DEFAULT_CONTENT_TYPE="text/html"; +MOP_create(Pool&); + // Request::Request(Pool& apool, Info& ainfo, String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), - OP(apool), + OP(*MOP_create(apool)), env(apool), form(apool), request(apool, *this), @@ -59,35 +55,86 @@ Request::Request(Pool& apool, default_content_type(0), mime_types(0), connection(0), protocol2library(0), - mail(0) + mail(0), + pcre_tables(0) { - // root superclass, - // parent of all classes, - // operators holder - initialize_op_class(pool(), OP); - classes().put(*op_class_name, &OP); - // table class - classes().put(*table_class_name, table_class); - // file class - classes().put(*file_class_name, file_class); - // random class - classes().put(*random_class_name, random_class); + // operators + OP.register_directly_used(r); // env class - classes().put(*env_class_name, &env); + classes().put(NEW String(ENV_CLASS_NAME), &env); // form class - classes().put(*form_class_name, &form); + classes().put(form.get_class().name(), &form); // request class - classes().put(*request_class_name, &request); + classes().put(NEW String(REQUEST_CLASS_NAME), &request); // response class - classes().put(*response_class_name, &response); + classes().put(response.get_class().name(), &response); // cookie class - classes().put(*cookie_class_name, &cookie); - // mail class - classes().put(*mail_class_name, mail_class); - // image class - classes().put(*image_class_name, image_class); + classes().put(NEW String(COOKIE_CLASS_NAME), &cookie); + + // classes: + // table, file, random, mail, image + methoded_array->register_directly_used(*this); } +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 @@ -95,12 +142,11 @@ Request::Request(Pool& apool, the file user requested us to process all located classes become children of one another, composing class we name 'MAIN' - - @test get rid of setlocale */ void Request::core(const char *root_auto_path, bool root_auto_fail, const char *site_auto_path, bool site_auto_fail, bool header_only) { + //_asm { int 3 } VStateless_class *main_class=0; bool need_rethrow=false; Exception rethrow_me; TRY { @@ -196,7 +242,7 @@ void Request::core(const char *root_auto // 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; - if(Value *element=main_class->get_element(*html_typo_name)) + if(Value *element=main_class->get_element(*user_html_name)) if(Table *table=element->get_table()) pool().set_tag(table); @@ -210,23 +256,39 @@ void Request::core(const char *root_auto if(Table *table=element->get_table()) mime_types=table; - // $MAIN:LOCALE.ctype[Russian_Russia.1251] -/* -#define LC_ALL 0 -#define LC_COLLATE 1 -#define LC_CTYPE 2 -#define LC_MONETARY 3 -#define LC_NUMERIC 4 -#define LC_TIME 5 -*/ - if(Value *locale=main_class->get_element(*locale_name)) - if(Value *element=locale->get_element(*locale_ctype_name)) { - const String& name=element->as_string(); - if(!setlocale(LC_CTYPE, name.cstr())) - THROW(0, 0, - &name, - "locale is invalid"); - } + /* + $MAIN:CTYPE[ + $white-space[ + ^#09^#0A^#0B^#0C^#0D^#20] + $digit[ + 0123456789] + $hex-digit[ + 0123456789ABCDEFabcdef] + $letter[ + ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] + $word[ + 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] + $meta[ + ^#00$()*+.?[^{|] + + $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); + } // $MAIN:MAIL[$SMTP[mail.design.ru]] if(Value *mail_element=main_class->get_element(*mail_name)) @@ -246,12 +308,12 @@ void Request::core(const char *root_auto VString body_vstring_before_post_process(*body_string); VString *body_vstring_after_post_process=&body_vstring_before_post_process; - // post-process + // @postprocess if(Value *value=main_class->get_element(*post_process_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to - // @post-process[data] + // @postprocess[data] VMethodFrame frame(pool(), *junction, false); frame.set_self(*main_class); @@ -266,7 +328,7 @@ void Request::core(const char *root_auto // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); - if(body_value) // there is some $request.body + if(body_value) // there is some $response.body body_file=body_value->as_vfile(); // OK. write out the result @@ -467,12 +529,12 @@ VStateless_class *Request::use_buf(const return &cclass; } -/// @test with commandline start "parser3 a.html" so that ^load[a.cfg] worked! [now doesnt] const String& Request::relative(const char *apath, const String& relative_name) { int lpath_buf_size=strlen(apath)+1; char *lpath=(char *)malloc(lpath_buf_size); memcpy(lpath, apath, lpath_buf_size); - rsplit(lpath, '/'); + if(!rsplit(lpath, '/')) + strcpy(lpath, "."); String& result=*NEW String(pool(), lpath); result << "/" << relative_name; return result; @@ -497,9 +559,8 @@ static void add_header_attribute(const H Value& lmeaning=*static_cast(ameaning); Pool& pool=lmeaning.pool(); - String attribute(pool); SAPI::add_header_attribute(pool, - attribute.append(aattribute, String::UL_HTTP_HEADER, true).cstr(), + aattribute.cstr(String::UL_AS_IS), attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER).cstr()); } void Request::output_result(const VFile& body_file, bool header_only) {