--- parser3/src/main/pa_request.C 2001/04/28 08:43:57 1.123 +++ parser3/src/main/pa_request.C 2001/07/18 13:18:00 1.145 @@ -4,14 +4,14 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.123 2001/04/28 08:43:57 paf Exp $ */ +static const char *RCSId="$Id: pa_request.C,v 1.145 2001/07/18 13:18:00 parser Exp $"; #include "pa_config_includes.h" #include "pcre.h" #include "internal.h" +extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c #include "pa_sapi.h" #include "pa_common.h" @@ -25,14 +25,12 @@ #include "pa_vtable.h" #include "pa_vfile.h" -/// $LIMITS.post_max_size default 10M -const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; - /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; /// content type of response when no $MAIN:defaults.content-type defined const char *DEFAULT_CONTENT_TYPE="text/html"; +const char *ORIGINS_CONTENT_TYPE="text/plain"; Methoded *MOP_create(Pool&); @@ -44,6 +42,7 @@ Request::Request(Pool& apool, OP(*MOP_create(apool)), env(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), @@ -54,15 +53,17 @@ Request::Request(Pool& apool, used_files(apool), default_content_type(0), mime_types(0), - connection(0), protocol2library(0), - mail(0), - pcre_tables(0) + main_class(0), + connection(0), + pcre_tables(0), + classes_conf(apool), + anti_endless_execute_recoursion(0) { /// directly used // operators OP.register_directly_used(*this); // classes: - // table, file, random, mail, image + // table, file, random, mail, image, ... methoded_array->register_directly_used(*this); /// methodless @@ -80,6 +81,8 @@ Request::Request(Pool& apool, /// bases used // form class classes().put(form.get_class()->base()->name(), &form); + // math class + classes().put(math.get_class()->base()->name(), &math); } static void element2ctypes(unsigned char *tables, @@ -148,14 +151,11 @@ static void element2case(unsigned char * the file user requested us to process all located classes become children of one another, composing class we name 'MAIN' - - @test move configure to M-class */ 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 { char *auto_filespec=(char *)malloc(MAX_STRING); @@ -170,34 +170,10 @@ void Request::core(const char *root_auto main_class_name, main_class); } - // $MAIN:LIMITS hash used here, + // configure root options // until someone with less privileges have overriden them - methoded_array->configure(*this); - { - Value *limits=main_class?main_class->get_element(*limits_name):0; - if(info.method && StrEqNc(info.method, "post", true)) { - // $limits.post_max_size default 10M - Value *element=limits?limits->get_element(*post_max_size_name):0; - size_t value=element?(size_t)element->as_double():0; - size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT; - - if(size_t limit=max(0, min(info.content_length, post_max_size))) { - // read POST data - post_data=(char *)malloc(limit); - post_size=SAPI::read_post(pool(), post_data, limit); - if(post_size!=limit) - THROW(0, 0, - 0, - "post_size(%d)!=limit(%d)", - post_size, limit); - } - } - - form.fill_fields(*this); - } - - // filling cookies - cookie.fill_fields(*this); + OP.configure_admin(*this); + methoded_array->configure_admin(*this); // loading site auto.p if(site_auto_path) { @@ -233,19 +209,23 @@ void Request::core(const char *root_auto } after=before+1; } - for(int i=ladder.size(); --i>=0; ) { + for(int i=0; iconfigure_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 @@ -255,11 +235,6 @@ void Request::core(const char *root_auto if(Table *table=element->get_table()) pool().set_tag(table); - // $MAIN:SQL.drivers - if(Value *sql=main_class->get_element(*main_sql_name)) - if(Value *element=sql->get_element(*main_sql_drivers_name)) - protocol2library=element->get_table(); - // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) @@ -277,8 +252,6 @@ void Request::core(const char *root_auto ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] $word[ 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] - $meta[ - ^#00$()*+.?[^{|] $lowercase[ AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] @@ -297,22 +270,22 @@ void Request::core(const char *root_auto cstr2ctypes(pcre_tables, (const unsigned char *)"*+?{^.$|()[", ctype_meta); element2case(pcre_tables, *ctype, *ctype_lowercase_name); - } + } else + pcre_tables=pcre_default_tables; - // $MAIN:MAIL[$SMTP[mail.design.ru]] - if(Value *mail_element=main_class->get_element(*mail_name)) - if(!(mail=mail_element->get_hash())) - THROW(0, 0, - 0, - "$MAIN:MAIL is not hash"); + // filling form fields + form.fill_fields(*this); + // filling cookies + cookie.fill_fields(*this); // execute @main[] - const String *body_string=execute_method(*main_class, *main_method_name); + const String *body_string=execute_virtual_method( + *main_class, *main_method_name); if(!body_string) THROW(0,0, - 0, - "'"MAIN_METHOD_NAME"' method not found"); + 0, + "'"MAIN_METHOD_NAME"' method not found"); VString body_vstring_before_post_process(*body_string); VString *body_vstring_after_post_process=&body_vstring_before_post_process; @@ -323,7 +296,7 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction, false); frame.set_self(*main_class); frame.store_param(method->name, @@ -332,13 +305,19 @@ void Request::core(const char *root_auto NEW VString(*execute_method(frame, *method)); } - const VFile *body_file=body_vstring_after_post_process->as_vfile(); + bool origins_mode=main_class->get_element(*origins_mode_name)!=0; + + const VFile *body_file=body_vstring_after_post_process->as_vfile( + String::UL_UNSPECIFIED, origins_mode); // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); if(body_value) // there is some $response.body body_file=body_value->as_vfile(); + else if(origins_mode) + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); // OK. write out the result output_result(*body_file, header_only); @@ -373,6 +352,8 @@ void Request::core(const char *root_auto // reset language to default flang=fdefault_lang; + if(flang==String::UL_USER_HTML) + flang=String::UL_HTML; // no _ & Co conversions in @exception[params] // reset response response.fields().clear(); @@ -388,7 +369,7 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @exception[origin;source;comment;type;code] - VMethodFrame frame(pool(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction, false); frame.set_self(*main_class); const String *problem_source=e.problem_source(); @@ -408,7 +389,7 @@ void Request::core(const char *root_auto } #endif frame.store_param(method->name, - origin_value?origin_value:NEW VUnknown(pool())); + origin_value?origin_value:NEW VVoid(pool())); // source Value *source_value=0; @@ -419,7 +400,7 @@ void Request::core(const char *root_auto source_value=NEW VString(problem_source_copy); } frame.store_param(method->name, - source_value?source_value:NEW VUnknown(pool())); + source_value?source_value:NEW VVoid(pool())); // comment String *comment_value=NEW String(pool(), @@ -434,7 +415,7 @@ void Request::core(const char *root_auto type_value=NEW VString(type_copy.append(*e.type(), flang, true)); } else - type_value=NEW VUnknown(pool()); + type_value=NEW VVoid(pool()); frame.store_param(method->name, type_value); // code @@ -444,7 +425,7 @@ void Request::core(const char *root_auto code_value=NEW VString(code_copy.append(*e.code(), flang, true)); } else - code_value=NEW VUnknown(pool()); + code_value=NEW VVoid(pool()); frame.store_param(method->name, code_value); // future $response:body= @@ -489,7 +470,7 @@ void Request::core(const char *root_auto body_string=NEW String(pool(), buf); } - const VString body_vstring(*body_string); + VString body_vstring(*body_string); const VFile *body_file=body_vstring.as_vfile(); // ERROR. write it out @@ -534,7 +515,7 @@ VStateless_class *Request::use_buf(const VStateless_class& cclass=COMPILE(source, aclass, name, base_class, file); // locate and execute possible @auto[] static method - execute_method(cclass, *auto_method_name, false /*no result needed*/); + execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/); return &cclass; } @@ -631,4 +612,4 @@ const String& Request::mime_type_of(cons "MIME-TYPE table column elements must not be empty"); } return *NEW String(pool(), "application/octet-stream"); -} \ No newline at end of file +}