--- parser3/src/main/pa_request.C 2001/04/23 10:44:31 1.120 +++ parser3/src/main/pa_request.C 2002/04/29 06:27:29 1.206 @@ -1,54 +1,54 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.120 2001/04/23 10:44:31 paf Exp $ + $Id: pa_request.C,v 1.206 2002/04/29 06:27:29 paf Exp $ */ -#include "pa_config_includes.h" - -#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; +#include "pa_dictionary.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"; /// 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&); +// op.C +VHash& exception2vhash(Pool& pool, const Exception& e); + +static void load_charset(const Hash::Key& akey, Hash::Val *avalue, + void *) { + charsets->load_charset(akey, static_cast(avalue)->as_string()); +} // Request::Request(Pool& apool, Info& ainfo, - String::Untaint_lang adefault_lang) : Pooled(apool), + uchar adefault_lang, + bool status_allowed) : Pooled(apool), stack(apool), - OP(apool), + OP(*MOP_create(apool)), env(apool), + status(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), @@ -59,96 +59,63 @@ 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), + fconnection(0), + classes_conf(apool), + anti_endless_execute_recoursion(0), + exception_trace(apool) +#ifdef RESOURCES_DEBUG + , sql_connect_time(0),sql_request_time(0) +#endif + , self(0), root(0), rcontext(0), wcontext(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); + // default charsets + pool().set_source_charset(*utf8_charset); + pool().set_client_charset(*utf8_charset); + + // maybe expire old caches + cache_managers->maybe_expire(); + + /// directly used + // operators + OP.register_directly_used(*this); + // classes: + // table, file, random, mail, image, ... + methoded_array->register_directly_used(*this); + + /// methodless // env class - classes().put(*env_class_name, &env); - // form class - classes().put(*form_class_name, &form); + classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); + // status class + if(status_allowed) + classes().put(*NEW String(pool(), STATUS_CLASS_NAME), &status); // request class - classes().put(*request_class_name, &request); - // response class - classes().put(*response_class_name, &response); + classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); // 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(pool(), COOKIE_CLASS_NAME), &cookie); -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; + /// methoded + // response class + classes().put(response.get_class()->name(), &response); - 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; - } + /// bases used + // form class + classes().put(form.get_class()->base()->name(), &form); + // math class + classes().put(math.get_class()->base()->name(), &math); } -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; +Request::~Request() { +#ifdef XML + // if for some strange reason xml generic errors failed to be reported, free them up + if(const char *xml_generic_errors=xmlGenericErrors()) { + SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors); + free((void *)xml_generic_errors); } +#endif } + + /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -156,60 +123,62 @@ 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 log stack trace + */ -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) { - VStateless_class *main_class=0; - bool need_rethrow=false; Exception rethrow_me; - TRY { + +#ifdef RESOURCES_DEBUG +//measures +struct timeval mt[10]; +//measure:before all +gettimeofday(&mt[0],NULL); +#endif + 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, root_auto_fail, + filespec, + true/*ignore class_path*/, root_config_fail_on_read_problem, main_class_name, main_class); } - - // $MAIN:LIMITS hash used here, - // until someone with less privileges have overriden them - { - 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); - } + // 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] + ... + ] + */ + if(Value *vcharsets=main_class->get_element(*charsets_name)) { + if(Hash *charsets=vcharsets->get_hash(0)) + charsets->for_each(load_charset); + else + throw Exception("parser.runtime", + 0, + "$" CHARSETS_NAME " must be hash"); } - - form.fill_fields(*this); } + // configure root options + // until someone with less privileges have overriden them + OP.configure_admin(*this); + methoded_array->configure_admin(*this); - // filling cookies - cookie.fill_fields(*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, site_auto_fail, + filespec, + true/*ignore class_path*/, site_config_fail_on_read_problem, main_class_name, main_class); } @@ -217,7 +186,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) { @@ -226,154 +194,144 @@ 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=ladder.size(); --i>=0; ) { - const String& sfile_spec=*ladder.get_string(i); - main_class=use_file(sfile_spec, false/*ignore read problem*/, - main_class_name, main_class); - } } - // compiling requested file + // compile requested file String& spath_translated=*NEW String(pool()); - spath_translated.APPEND_CLEAN(info.path_translated, 0, "user-request", 0); - main_class=use_file(spath_translated, true/*don't ignore read problem*/, + 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*/, main_class_name, main_class); - // $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; - if(Value *element=main_class->get_element(*user_html_name)) - 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(); + // configure not-root=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(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] - $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)) - if(!(mail=mail_element->get_hash())) - THROW(0, 0, - 0, - "$MAIN:MAIL is not hash"); + // filling form fields + form.fill_fields_and_tables(*this); + // filling cookies + cookie.fill_fields(*this); +#ifdef RESOURCES_DEBUG +//measure:after compile +gettimeofday(&mt[1],NULL); +#endif // 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"); + throw Exception("parser.runtime", + 0, + "'"MAIN_METHOD_NAME"' method not found"); + +#ifdef RESOURCES_DEBUG + //measure:after main +gettimeofday(&mt[2],NULL); +#endif 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(*post_process_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), *junction, false); + VMethodFrame frame(pool(), method->name, *junction); frame.set_self(*main_class); - frame.store_param(method->name, - &body_vstring_before_post_process); + frame.store_param(&body_vstring_before_post_process); body_vstring_after_post_process= - NEW VString(*execute_method(frame, *method)); + NEW VString(execute_method(frame, *method)); } - const VFile *body_file=body_vstring_after_post_process->as_vfile(); + bool lorigins_mode=origins_mode(); + + const VFile *body_file=body_vstring_after_post_process->as_vfile( + String::UL_UNSPECIFIED, lorigins_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(lorigins_mode) + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); + +#ifdef RESOURCES_DEBUG +//measure:after postprocess +gettimeofday(&mt[3],NULL); +#endif // OK. write out the result output_result(*body_file, header_only); - } - CATCH(e) { // request handling problem + +#ifdef RESOURCES_DEBUG + //measure:after output_result +gettimeofday(&mt[9],NULL); +t[9]=mt[9].tv_sec+mt[9].tv_usec/1000000.0; + +double t[10]; +for(int i=0;i<10;i++) + t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; +//measure:log2 compile,main,postprocess,output +SAPI::log(pool(), "rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", +info.uri, +t[1]-t[0], +t[2]-t[1], +t[3]-t[2], +sql_connect_time,sql_request_time, +t[9]-t[3] +); +#endif + } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation - TRY { + try { // log the beast - const String *problem_source=e.problem_source(); - if(problem_source && problem_source->size()) + if(const String *problem_source=e.problem_source()) SAPI::log(pool(), + "%s: " #ifndef NO_STRING_ORIGIN - "%s(%d): " + ORIGIN_FILE_LINE_FORMAT": " #endif - "'%s' %s [%s %s]", + "'%s' %s [%s]", + info.uri, #ifndef NO_STRING_ORIGIN problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(String::UL_AS_IS), + problem_source->cstr(), e.comment(), - e.type()?e.type()->cstr(String::UL_AS_IS):"-", - e.code()?e.code()->cstr(String::UL_AS_IS):"-" + e.type() ); else SAPI::log(pool(), - "%s [%s %s]", - e.comment(), - e.type()?e.type()->cstr(String::UL_AS_IS):"-", - e.code()?e.code()->cstr(String::UL_AS_IS):"-" - ); + "%s: " + "%s [%s]", + info.uri, + e.comment(), e.type() + ); // reset language to default flang=fdefault_lang; @@ -387,73 +345,44 @@ void Request::core(const char *root_auto if(main_class) { // we've managed to end up with some main_class // maybe we'd be lucky enough as to report an error // in a gracefull way... - if(Value *value=main_class->get_element(*exception_method_name)) + if(Value *value=main_class->get_element(*unhandled_exception_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { - // preparing to pass parameters to - // @exception[origin;source;comment;type;code] - VMethodFrame frame(pool(), *junction, false); + // preparing to pass parameters to + // @unhandled_exception[exception;stack] + VMethodFrame frame(pool(), method->name, *junction); frame.set_self(*main_class); - const String *problem_source=e.problem_source(); - // origin - Value *origin_value=0; + // $exception + frame.store_param(&exception2vhash(pool(), e)); + // $stack[^table::set{name origin}] + Array& stack_trace_columns=*NEW Array(pool()); + stack_trace_columns+=NEW String(pool(), "name"); + stack_trace_columns+=NEW String(pool(), "file"); + stack_trace_columns+=NEW String(pool(), "lineno"); + Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); + Array_iter tracei(exception_trace); + while(tracei.has_next()) { + Array& row=*NEW Array(pool()); + + const String *name=(const String *)tracei.next(); + row+=name; // name column #ifndef NO_STRING_ORIGIN - if(problem_source && problem_source->size()) { - const Origin& origin=problem_source->origin(); + const Origin& origin=name->origin(); if(origin.file) { - char *buf=(char *)malloc(MAX_STRING); - size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d):", - origin.file, 1+origin.line); - String *origin_file_line=NEW String(pool(), - buf, buf_size, true); - origin_value=NEW VString(*origin_file_line); + row+=NEW String(pool(), origin.file, 0, true); // file column + char *buf=(char *)malloc(MAX_NUMBER); + size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); + row+=NEW String(pool(), buf, buf_size, true); // line column } - } #endif - frame.store_param(method->name, - origin_value?origin_value:NEW VUnknown(pool())); - - // source - Value *source_value=0; - if(problem_source && problem_source->size()) { - String& problem_source_copy=*NEW String(pool()); - problem_source_copy.append(*problem_source, - flang, true); - source_value=NEW VString(problem_source_copy); + stack_trace+=&row; } - frame.store_param(method->name, - source_value?source_value:NEW VUnknown(pool())); - - // comment - String *comment_value=NEW String(pool(), - e.comment(), 0, true); - frame.store_param(method->name, - NEW VString(*comment_value)); - - // type - Value *type_value; - if(e.type()) { - String& type_copy=*NEW String(pool()); - type_value=NEW VString(type_copy.append(*e.type(), - flang, true)); - } else - type_value=NEW VUnknown(pool()); - frame.store_param(method->name, type_value); - - // code - Value *code_value; - if(e.code()) { - String& code_copy=*NEW String(pool()); - code_value=NEW VString(code_copy.append(*e.code(), - flang, true)); - } else - code_value=NEW VUnknown(pool()); - frame.store_param(method->name, code_value); + frame.store_param(NEW VTable(pool(), &stack_trace)); // future $response:body= - // execute ^exception[origin;source;comment;type;code] - body_string=execute_method(frame, *method); + // execute ^exception[origin;source;comment;type;code;stack] + body_string=&execute_method(frame, *method); } } @@ -463,28 +392,22 @@ void Request::core(const char *root_auto // make up result: $origin $source $comment $type $code char *buf=(char *)malloc(MAX_STRING); size_t printed=0; - const String *problem_source=e.problem_source(); - if(problem_source) { + if(const String *problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN const Origin& origin=problem_source->origin(); if(origin.file) - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s(%d): ", - origin.file, 1+origin.line); + printed+=snprintf(buf+printed, MAX_STRING-printed, + ORIGIN_FILE_LINE_FORMAT": ", + origin.file, 1+origin.line + ); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr(String::UL_AS_IS)); - } - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", - e.comment()); - const String *type=e.type(); - if(type) { - printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", - type->cstr(String::UL_AS_IS)); - const String *code=e.code(); - if(code) - printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", - code->cstr(String::UL_AS_IS)); + problem_source->cstr()); } + if(const char *comment=e.comment(true)) + printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); + if(const char *type=e.type(true)) + printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", type); // future $response:content-type response.fields().put(*content_type_name, @@ -493,42 +416,64 @@ 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 output_result(*body_file, header_only); + } catch(const Exception& ) { + /*re*/throw; } - CATCH(e) { - // exception in request exception handler - // remember to rethrow it - rethrow_me=e; need_rethrow=true; - } - END_CATCH } - END_CATCH // do not use pool() after this point - no exception handler set - // any throw() would try to use zero exception() pointer - - if(need_rethrow) // were there an exception for us to rethrow? - THROW(rethrow_me.type(), rethrow_me.code(), - rethrow_me.problem_source(), - rethrow_me.comment()); } -VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem, +VStateless_class *Request::use_file(const String& file_name, + bool ignore_class_path, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { // cyclic dependence check - if(used_files.get(file_spec)) + if(used_files.get(file_name)) return base_class; - used_files.put(file_spec, (Hash::Val *)true); + used_files.put(file_name, (Hash::Val *)true); + const String *file_spec; + if(ignore_class_path) // ignore_class_path? + file_spec=&file_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(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(absolute(path), file_name)) + break; // found along class_path + } + } else + throw Exception("parser.runtime", + 0, + "$" CLASS_PATH_NAME " must be string or table"); + if(!file_spec) + throw Exception("parser.runtime", + &file_name, + "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + } + if(!file_spec) + throw Exception("parser.runtime", + &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); + char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); if(!source) return base_class; - return use_buf(source, file_spec.cstr(), 0/*new class*/, name, base_class); + return use_buf(source, file_spec->cstr(), 0/*new class*/, name, base_class); } VStateless_class *Request::use_buf(const char *source, const char *file, @@ -538,7 +483,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; } @@ -565,15 +510,16 @@ const String& Request::absolute(const St static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, void *info) { - String *attribute_to_exclude=static_cast(info); - if(aattribute==*attribute_to_exclude) + Request& r=*static_cast(info); + if(aattribute==BODY_NAME + || aattribute==CHARSET_NAME) return; Value& lmeaning=*static_cast(ameaning); Pool& pool=lmeaning.pool(); SAPI::add_header_attribute(pool, - aattribute.cstr(String::UL_AS_IS), + aattribute.cstr(), attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER).cstr()); } void Request::output_result(const VFile& body_file, bool header_only) { @@ -596,30 +542,32 @@ void Request::output_result(const VFile& if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) if(vfile_name->string()!=NONAME_DAT) { VHash& vhash=*NEW VHash(pool()); - vhash.hash().put(*content_disposition_filename_name, vfile_name); + vhash.hash(0).put(*content_disposition_filename_name, vfile_name); response.fields().put(*content_disposition_name, &vhash); } // prepare header: $response:fields without :body - response.fields().for_each(add_header_attribute, /*excluding*/ body_name); + 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://..."] - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); - SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); - } + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); + SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); // send header SAPI::send_header(pool()); // 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) { @@ -630,9 +578,9 @@ const String& Request::mime_type_of(cons if(const String *result=mime_types->item(1)) return *result; else - THROW(0, 0, + throw Exception("parser.runtime", mime_types->origin_string(), "MIME-TYPE table column elements must not be empty"); } return *NEW String(pool(), "application/octet-stream"); -} \ No newline at end of file +}