--- parser3/src/main/pa_request.C 2002/07/30 13:37:08 1.216 +++ parser3/src/main/pa_request.C 2002/10/14 12:16:06 1.232 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_request.C,v 1.216 2002/07/30 13:37:08 paf Exp $ */ +static const char* IDENT_REQUEST_C="$Date: 2002/10/14 12:16:06 $"; + #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -68,7 +68,7 @@ Request::Request(Pool& apool, #ifdef RESOURCES_DEBUG , sql_connect_time(0),sql_request_time(0) #endif - , self(0), root(0), rcontext(0), wcontext(0) + , self(0), method_frame(0), rcontext(0), wcontext(0) { // default charsets pool().set_source_charset(*utf8_charset); @@ -101,11 +101,11 @@ Request::Request(Pool& apool, /// bases used // form class - classes().put(form.get_class()->base()->name(), &form); + classes().put(form.get_class()->base_class()->name(), &form); // mail class - classes().put(mail.get_class()->base()->name(), &mail); + classes().put(mail.get_class()->base_class()->name(), &mail); // math class - classes().put(math.get_class()->base()->name(), &math); + classes().put(math.get_class()->base_class()->name(), &math); } Request::~Request() { @@ -128,7 +128,7 @@ void Request::configure_admin(VStateless "parser already configured"); configure_admin_done=true; - // charsets must only be specified in root config + // charsets must only be specified in method_frame config // so that users would not interfere /* $MAIN:CHARSETS[ @@ -136,7 +136,7 @@ void Request::configure_admin(VStateless ... ] */ - if(Value *vcharsets=conf_class.get_element(*charsets_name)) { + if(Value *vcharsets=conf_class.get_element(*charsets_name, &conf_class, false)) { if(Hash *charsets=vcharsets->get_hash(0)) charsets->for_each(load_charset); else if(!vcharsets->get_string()) @@ -145,7 +145,7 @@ void Request::configure_admin(VStateless "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); } - // configure root options + // configure method_frame options // until someone with less privileges have overriden them OP.configure_admin(*this); methoded_array->configure_admin(*this); @@ -181,7 +181,8 @@ gettimeofday(&mt[0],NULL); filespec.APPEND_CLEAN(config_filespec, 0, "config", 0); main_class=use_file( filespec, - true/*ignore class_path*/, config_fail_on_read_problem, + true/* ignore class_path */, + config_fail_on_read_problem, true/* file must exist if 'fail on read problem' not set */, main_class_name, main_class); } @@ -207,7 +208,8 @@ gettimeofday(&mt[0],NULL); sfile_spec << "/" AUTO_FILE_NAME; main_class=use_file(sfile_spec, - true/*ignore class_path*/, false/*ignore read problem*/, + true/* ignore class_path */, + true/* fail on read problem */, false/* but ignore absence, sole user */, main_class_name, main_class); } after=before+1; @@ -218,19 +220,20 @@ gettimeofday(&mt[0],NULL); String& spath_translated=*NEW String(pool()); spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0); main_class=use_file(spath_translated, - true/*ignore class_path*/, true/*don't ignore read problem*/, + true/* ignore class_path */, + true/* fail on read problem*/, true/* fail on abscence */, main_class_name, main_class); - // configure root options if not configured yet + // configure method_frame options if not configured yet if(!configure_admin_done) configure_admin(*main_class, 0); - // configure not-root=user options + // configure not-method_frame=user options OP.configure_user(*this); methoded_array->configure_user(*this); // $MAIN:MIME-TYPES - if(Value *element=main_class->get_element(*mime_types_name)) + if(Value *element=main_class->get_element(*mime_types_name, main_class, false)) if(Table *table=element->get_table()) mime_types=table; @@ -262,7 +265,10 @@ gettimeofday(&mt[2],NULL); VString body_vstring_before_post_process(*body_string); VString *body_vstring_after_post_process=&body_vstring_before_post_process; // @postprocess - if(Value *value=main_class->get_element(*NEW String(pool(), POST_PROCESS_METHOD_NAME))) + if(Value *value=main_class->get_element( + *NEW String(pool(), POST_PROCESS_METHOD_NAME), + main_class, + false)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to @@ -356,7 +362,9 @@ t[9]-t[3] // maybe we'd be lucky enough as to report an error // in a gracefull way... if(Value *value=main_class->get_element( - *NEW String(pool(), UNHANDLED_EXCEPTION_METHOD_NAME))) + *NEW String(pool(), UNHANDLED_EXCEPTION_METHOD_NAME), + main_class, + false)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to @@ -392,7 +400,7 @@ t[9]-t[3] frame.store_param(NEW VTable(pool(), &stack_trace)); // future $response:body= - // execute ^exception[origin;source;comment;type;code;stack] + // execute ^unhandled_exception[exception;stack] body_string=&execute_method(frame, *method); } } @@ -439,7 +447,8 @@ t[9]-t[3] } VStateless_class *Request::use_file(const String& file_name, - bool ignore_class_path, bool fail_on_read_problem, + bool ignore_class_path, + bool fail_on_read_problem, bool fail_on_file_absence, const String *name, VStateless_class *base_class) { // cyclic dependence check @@ -455,7 +464,7 @@ VStateless_class *Request::use_file(cons else { file_spec=0; if(main_class) - if(Value *element=main_class->get_element(*class_path_name)) { + if(Value *element=main_class->get_element(*class_path_name, main_class, false)) { if(element->is_string()) { file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { @@ -480,6 +489,10 @@ VStateless_class *Request::use_file(cons "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } + if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for + if(!entry_exists(*file_spec)) + return base_class; + char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); if(!source) return base_class; @@ -500,35 +513,35 @@ VStateless_class *Request::use_buf(const // locate and execute possible @conf[] static const Method *method_called; execute_nonvirtual_method(cclass, - *conf_method_name, vfilespec, + cclass.get_method(*conf_method_name), vfilespec, 0/*no result needed*/, &method_called); if(method_called) { if(!main_class) - main_class=&cclass; // for root auto.p, when main_class not assigned yet + main_class=&cclass; // for method_frame auto.p, when main_class not assigned yet configure_admin(cclass, &method_called->name); } // locate and execute possible @auto[] static - execute_nonvirtual_method(cclass, - *auto_method_name, vfilespec, + execute_nonvirtual_method( + &cclass==&OP?*main_class:cclass, // execute operators@auto in MAIN context + cclass.get_method(*auto_method_name), vfilespec, 0/*no result needed*/); return &cclass; } 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); - if(!rsplit(lpath, '/')) - strcpy(lpath, "."); - String& result=*NEW String(pool(), lpath); - result << "/" << relative_name; + int hpath_buf_size=strlen(apath)+1; + char *hpath=(char *)malloc(hpath_buf_size); + memcpy(hpath, apath, hpath_buf_size); + String& result=*NEW String(pool()); + if(rsplit(hpath, '/')) // if something/splitted + result << hpath << "/"; + result << relative_name; return result; } const String& Request::absolute(const String& relative_name) { - char *relative_name_cstr=relative_name.cstr(); - if(relative_name_cstr[0]=='/') { + if(relative_name.first_char()=='/') { String& result=*NEW String(pool(), info.document_root); result << relative_name; return result; @@ -554,9 +567,10 @@ void Request::output_result(const VFile& // header: cookies cookie.output_result(); + Value *body_file_content_type; // set content-type - if(String *body_file_content_type=static_cast( - body_file.fields().get(*vfile_mime_type_name))) { + if(body_file_content_type=static_cast( + body_file.fields().get(*content_type_name))) { // body file content type response.fields().put(*content_type_name, body_file_content_type); } else { @@ -577,13 +591,21 @@ void Request::output_result(const VFile& // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, this); - // 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 - ); + // transcode text body when "text/*" or simple result + if(body_file_content_type) + if(Hash *hash=body_file_content_type->get_hash(0)) + body_file_content_type=static_cast(hash->get(*value_name)); + if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) { + Charset::transcode(pool(), + pool().get_source_charset(), body_file.value_ptr(), body_file.value_size(), + pool().get_client_charset(), client_body, client_content_length + ); + } else { + client_body=body_file.value_ptr(); + client_content_length=body_file.value_size(); + } // prepare header: content-length char content_length_cstr[MAX_NUMBER]; @@ -602,7 +624,7 @@ const String& Request::mime_type_of(cons if(mime_types) if(const char *cext=strrchr(user_file_name_cstr, '.')) { String sext(pool(), ++cext); - if(mime_types->locate(0, sext)) + if(mime_types->locate(0, sext.change_case(pool(), String::CC_LOWER))) if(const String *result=mime_types->item(1)) return *result; else