--- parser3/src/main/pa_request.C 2003/02/17 16:44:57 1.245.2.24 +++ parser3/src/main/pa_request.C 2003/03/19 16:28:08 1.245.2.37.2.2 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/02/17 16:44:57 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/03/19 16:28:08 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -16,12 +16,20 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vint.h" #include "pa_vmethod_frame.h" #include "pa_types.h" +#include "pa_venv.h" +#include "pa_vmath.h" +#include "pa_vstatus.h" +#include "pa_vrequest.h" #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" #include "pa_charset.h" #include "pa_charsets.h" #include "pa_cache_managers.h" +#include "pa_vmail.h" +#include "pa_vform.h" +#include "pa_vcookie.h" +#include "pa_vresponse.h" // consts @@ -42,12 +50,12 @@ const char* ORIGINS_CONTENT_TYPE="text/p // globals -StringPtr main_method_name(new String(MAIN_METHOD_NAME)); -StringPtr auto_method_name(new String(AUTO_METHOD_NAME)); -StringPtr content_disposition_name(new String(CONTENT_DISPOSITION_NAME)); -StringPtr content_disposition_value(new String(CONTENT_DISPOSITION_VALUE)); -StringPtr content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME)); -StringPtr body_name(new String(BODY_NAME)); +const String& main_method_name(new String(MAIN_METHOD_NAME)); +const String& auto_method_name(new String(AUTO_METHOD_NAME)); +const String& content_disposition_name(new String(CONTENT_DISPOSITION_NAME)); +const String& content_disposition_value(new String(CONTENT_DISPOSITION_VALUE)); +const String& content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME)); +const String& body_name(new String(BODY_NAME)); // defines for statics @@ -61,27 +69,27 @@ StringPtr body_name(new String(BODY_NAME // statics -static StringPtr charsets_name(new String(CHARSETS_NAME)); -static StringPtr main_class_name(new String(MAIN_CLASS_NAME)); -static StringPtr mime_types_name(new String(MIME_TYPES_NAME)); -static StringPtr origins_mode_name(new String(ORIGINS_MODE_NAME)); -static StringPtr conf_method_name(new String(CONF_METHOD_NAME)); -static StringPtr post_process_method_name(new String(POST_PROCESS_METHOD_NAME)); -static StringPtr download_name(new String(DOWNLOAD_NAME)); -static StringPtr class_path_name(new String(CLASS_PATH_NAME)); +static const String& charsets_name(new String(CHARSETS_NAME)); +static const String& main_class_name(new String(MAIN_CLASS_NAME)); +static const String& mime_types_name(new String(MIME_TYPES_NAME)); +static const String& origins_mode_name(new String(ORIGINS_MODE_NAME)); +static const String& conf_method_name(new String(CONF_METHOD_NAME)); +static const String& post_process_method_name(new String(POST_PROCESS_METHOD_NAME)); +static const String& download_name(new String(DOWNLOAD_NAME)); +static const String& class_path_name(new String(CLASS_PATH_NAME)); // defines // op.C VStateless_classPtr VClassMAIN_create(); // op.C -VHashPtr exception2vhash(Pool& pool, const Exception& e); +VHashPtr exception2vhashconst Exception& e); // -Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, - uchar adefault_lang, bool status_allowed): +Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, + String_UL adefault_lang, bool status_allowed): // private - fpool(apool), + fpool(), anti_endless_execute_recoursion(0), // public @@ -129,17 +137,17 @@ Request::Request(Pool& apool, SAPI_Info& /// methodless // env class - classes().put(StringPtr(new String(ENV_CLASS_NAME)), - ValuePtr(new VEnv(asapi_info))); + classes().put(String* (new String(ENV_CLASS_NAME)), + ValuePtr(new VEnv(pool(), asapi_info))); // status class if(status_allowed) - classes().put(StringPtr(new String(STATUS_CLASS_NAME)), - ValuePtr(new VStatus(pool()))); + classes().put(String* (new String(STATUS_CLASS_NAME)), + ValuePtr(new VStatus())); // request class - classes().put(StringPtr(new String(REQUEST_CLASS_NAME)), + classes().put(String* (new String(REQUEST_CLASS_NAME)), ValuePtr(new VRequest(arequest_info, charsets))); // cookie class - classes().put(StringPtr(new String(COOKIE_CLASS_NAME)), cookie); + classes().put(String* (new String(COOKIE_CLASS_NAME)), cookie); /// methoded // response class @@ -152,7 +160,7 @@ Request::Request(Pool& apool, SAPI_Info& classes().put(mail->get_class()->base_class()->name(), mail); // math class { - ValuePtr math(new VMail); + ValuePtr math(new VMath); classes().put(math->get_class()->base_class()->name(), math); } } @@ -161,7 +169,7 @@ 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); + SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors); free((void *)xml_generic_errors); } #endif @@ -172,7 +180,7 @@ ValuePtr Request::get_self() { return me static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) { ::charsets.load_charset(akey, avalue->as_string(0)); } -void Request::configure_admin(VStateless_class& conf_class, StringPtr source) { +void Request::configure_admin(VStateless_class& conf_class, const String* source) { if(configure_admin_done) throw Exception("parser.runtime", source, @@ -189,11 +197,11 @@ void Request::configure_admin(VStateless */ if(ValuePtr vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { if(!vcharsets->is_string()) - if(HashStringValue* charsets=vcharsets->get_hash(StringPtr(0))) + if(HashStringValue* charsets=vcharsets->get_hash(0)) charsets->for_each(load_charset, 0); else throw Exception("parser.runtime", - Exception::undefined_source, + 0, "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); } @@ -226,7 +234,7 @@ gettimeofday(&mt[0],NULL); try { // loading config if(config_filespec) { - StringPtr filespec(new String); + const String& filespec(new String); filespec->APPEND_CLEAN(config_filespec, 0, "config", 0); use_file(*main_class, filespec, true/* ignore class_path */, @@ -247,7 +255,7 @@ gettimeofday(&mt[0],NULL); int step=0; while(const char* before=strchr(after, '/')) { - StringPtr sfile_spec(new String); + const String& sfile_spec(new String); if(after!=request_info.path_translated) { sfile_spec->APPEND_CLEAN( request_info.path_translated, before-request_info.path_translated, @@ -263,7 +271,7 @@ gettimeofday(&mt[0],NULL); } // compile requested file - StringPtr spath_translated(new String); + const String& spath_translated(new String); spath_translated->APPEND_TAINTED(request_info.path_translated, 0, "user-request", 0); use_file(*main_class, spath_translated, true/* ignore class_path */, @@ -271,7 +279,7 @@ gettimeofday(&mt[0],NULL); // configure method_frame options if not configured yet if(!configure_admin_done) - configure_admin(*main_class, StringPtr(0)); + configure_admin(*main_class, 0); // configure not-method_frame=user options methoded_array().configure_user(*this); @@ -288,17 +296,17 @@ gettimeofday(&mt[0],NULL); cookie->fill_fields(pool(), request_info); // filling mail received - mail->fill_received(pool(), request_info); + mail->fill_received(*this); #ifdef RESOURCES_DEBUG //measure:after compile gettimeofday(&mt[1],NULL); #endif // execute @main[] - StringPtr body_string=execute_virtual_method(main_class, main_method_name); + const String& body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) throw Exception("parser.runtime", - Exception::undefined_source, + 0, "'"MAIN_METHOD_NAME"' method not found"); #ifdef RESOURCES_DEBUG @@ -306,8 +314,8 @@ gettimeofday(&mt[1],NULL); gettimeofday(&mt[2],NULL); #endif - VStringPtr body_vstring_before_post_process(new VString(body_string)); - VStringPtr body_vstring_after_post_process(body_vstring_before_post_process); + Vconst String& body_vstring_before_post_process(new VString(body_string)); + Vconst String& body_vstring_after_post_process(body_vstring_before_post_process); // @postprocess if(ValuePtr value=main_class->get_element(post_process_method_name, *main_class, false)) if(JunctionPtr junction=value->get_junction()) @@ -319,7 +327,7 @@ gettimeofday(&mt[2],NULL); frame.store_param(body_vstring_before_post_process); body_vstring_after_post_process= - VStringPtr(new VString(execute_method(frame, *method))); + VString* (new VString(execute_method(frame, *method))); } bool lorigins_mode=origins_mode(); @@ -334,10 +342,10 @@ gettimeofday(&mt[2],NULL); body_value=response->fields().get(body_name); if(body_value) // there is some $response:body - body_file=body_value->as_vfile(pool()); + body_file=body_value->as_vfile(); else if(lorigins_mode) response->fields().put(content_type_name, - ValuePtr(new VString(StringPtr(new String(ORIGINS_CONTENT_TYPE))))); + ValuePtr(new VString(String* (new String(ORIGINS_CONTENT_TYPE))))); #ifdef RESOURCES_DEBUG //measure:after postprocess @@ -369,7 +377,7 @@ t[9]-t[3] // we're returning not result, but error explanation try { // log the beast - if(StringPtr problem_source=e.problem_source()) + if(const String* problem_source=e.problem_source()) SAPI::log(sapi_info, "%s: " #ifndef NO_STRING_ORIGIN @@ -400,12 +408,12 @@ t[9]-t[3] response->fields().clear(); // this is what we'd return in $response:body - StringPtr body_string(0); + const String& body_string(0); // maybe we'd be lucky enough as to report an error // in a gracefull way... if(ValuePtr value=main_class->get_element( - StringPtr(new String(UNHANDLED_EXCEPTION_METHOD_NAME)), + String* (new String(UNHANDLED_EXCEPTION_METHOD_NAME)), *main_class, false)) { if(JunctionPtr junction=value->get_junction()) { @@ -419,23 +427,23 @@ t[9]-t[3] frame.store_param(exception2vhash(pool(), e)); // $stack[^table::set{name origin}] Table::columns_type stack_trace_columns(new ArrayString); - *stack_trace_columns+=StringPtr(new String("name")); - *stack_trace_columns+=StringPtr(new String("file")); - *stack_trace_columns+=StringPtr(new String("lineno")); - TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); - Array_iterator tracei(exception_trace); + *stack_trace_columns+=String* (new String("name")); + *stack_trace_columns+=String* (new String("file")); + *stack_trace_columns+=String* (new String("lineno")); + Table* stack_trace(new Table(0, stack_trace_columns)); + Array_iterator tracei(exception_trace); while(tracei.has_next()) { - Table::element_type row; + Table::element_type row(new ArrayString); - StringPtr name=tracei.next(); + const String& name=tracei.next(); *row+=name; // name column #ifndef NO_STRING_ORIGIN const String_fragment::Origin& origin=name->origin(); if(origin.file) { - *row+=StringPtr(new String(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+=StringPtr(new String(buf, buf_size, true)); // line column + *row+=String* (new String(origin.file, 0, true)); // file column + *row+=String* (new String( + pool().format_integer(1+origin.line), + 0, true)); // line column } #endif *stack_trace+=row; @@ -453,9 +461,9 @@ t[9]-t[3] // doing that ugly // make up result: $origin $source $comment $type $code - char *buf=(char *)malloc(MAX_STRING); + char *buf=new char[MAX_STRING]; size_t printed=0; - if(StringPtr problem_source=e.problem_source()) { + if(const String* problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN const String_fragment::Origin& origin=problem_source->origin(); if(origin.file) @@ -474,13 +482,13 @@ t[9]-t[3] // future $response:content-type response->fields().put(content_type_name, - ValuePtr(new VString(StringPtr(new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))))); + ValuePtr(new VString(String* (new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))))); // future $response:body - body_string=StringPtr(new String(buf)); + body_string=String* (new String(buf)); } VString body_vstring(body_string); - VFilePtr body_file=body_vstring.as_vfile(pool()); + VFilePtr body_file=body_vstring.as_vfile(); // ERROR. write it out output_result(body_file, header_only, false); @@ -490,34 +498,34 @@ t[9]-t[3] } } -VStateless_classPtr Request::use_file(VStateless_class& aclass, - StringPtr file_name, bool ignore_class_path, +void Request::use_file(VStateless_class& aclass, + const String& file_name, bool ignore_class_path, bool fail_on_read_problem, bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_name)) - return VStateless_classPtr(0); + return; used_files.put(file_name, true); - StringPtr file_spec; + 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=StringPtr(0); + file_spec=0; if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) { if(element->is_string()) { file_spec=file_readable(*absolute(element->as_string(&pool())), *file_name); // found at class_path? } else if(Table *table=element->get_table()) { int size=table->count(); for(int i=size; i--; ) { - StringPtr path=(*table->get(i))[0]; + const String& path=(*table->get(i))[0]; if(file_spec=file_readable(*absolute(path), *file_name)) break; // found along class_path } } else throw Exception("parser.runtime", - Exception::undefined_source, + 0, "$" CLASS_PATH_NAME " must be string or table"); if(!file_spec) throw Exception("parser.runtime", @@ -532,18 +540,16 @@ VStateless_classPtr Request::use_file(VS if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for if(!entry_exists(file_spec)) - return VStateless_classPtr(0); + return; if(const char *source=file_read_text(pool(), charsets.source(), file_spec, fail_on_read_problem)) - return use_buf(aclass, source, file_spec, file_spec->cstr(pool())); - else - return VStateless_classPtr(0); + use_buf(aclass, source, file_spec, file_spec->cstr()); } -VStateless_classPtr Request::use_buf(VStateless_class& aclass, +void Request::use_buf(VStateless_class& aclass, const char* source, - StringPtr filespec, const char* filespec_cstr) { + const String& filespec, const char* filespec_cstr) { // temporary zero @conf so to maybe-replace it in compiled code Temp_method temp_method_conf(aclass, conf_method_name, MethodPtr(0)); // temporary zero @auto so to maybe-replace it in compiled code @@ -553,33 +559,31 @@ VStateless_classPtr Request::use_buf(VSt VStateless_class& cclass=COMPILE(&aclass, source, filespec_cstr); // locate and execute possible @conf[] static - VStringPtr vfilespec(new VString(filespec)); - const Method *method_called; - execute_nonvirtual_method(cclass, + Vconst String& vfilespec(new VString(filespec)); + Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, conf_method_name, vfilespec, - false/*no result needed*/, &method_called); - if(method_called) - configure_admin(cclass, method_called->name); + false/*no string result needed*/); + if(executed.method) + configure_admin(cclass, executed.method->name); // locate and execute possible @auto[] static execute_nonvirtual_method(cclass, auto_method_name, vfilespec, false/*no result needed*/); - return VStateless_classPtr(&cclass); } -StringPtr Request::relative(const char* apath, StringPtr relative_name) { +const String& Request::relative(const char* apath, const String& relative_name) { char *hpath=pool().copy(apath); - StringPtr result(new String); + const String& result(new String); if(rsplit(hpath, '/')) // if something/splitted *result << hpath << "/"; *result << relative_name; return result; } -StringPtr Request::absolute(StringPtr relative_name) { +const String& Request::absolute(const String& relative_name) { if(relative_name->first_char()=='/') { - StringPtr result=StringPtr(new String(request_info.document_root)); + const String& result=String* (new String(request_info.document_root)); *result << relative_name; return result; } else @@ -613,14 +617,14 @@ void Request::output_result(VFilePtr bod } else { // default content type response->fields().put_dont_replace(content_type_name, - ValuePtr(new VString(StringPtr(new String(DEFAULT_CONTENT_TYPE))))); + ValuePtr(new VString(String* (new String(DEFAULT_CONTENT_TYPE))))); } // content-disposition if(ValuePtr vfile_name=body_file->fields().get(name_name)) if(*vfile_name->get_string(&fpool)!=NONAME_DAT) { VHashPtr hash(new VHash); - HashStringValue &h=hash->hash(Exception::undefined_source); + HashStringValue &h=hash->hash(0); if(as_attachment) h.put(value_name, ValuePtr(new VString(content_disposition_value))); h.put(content_disposition_filename_name, vfile_name); @@ -634,7 +638,7 @@ void Request::output_result(VFilePtr bod size_t client_content_length; // transcode text body when "text/*" or simple result if(body_file_content_type) - if(HashStringValue *hash=body_file_content_type->get_hash(Exception::undefined_source)) + if(HashStringValue *hash=body_file_content_type->get_hash(0)) body_file_content_type=hash->get(value_name); if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string(&pool())->pos("text/")==0) { Charset::transcode(pool(), @@ -659,12 +663,12 @@ void Request::output_result(VFilePtr bod SAPI::send_body(sapi_info, client_body, client_content_length); } -StringPtr Request::mime_type_of(const char* user_file_name_cstr) { +const String& Request::mime_type_of(const char* user_file_name_cstr) { if(mime_types) if(const char* cext=strrchr(user_file_name_cstr, '.')) { String sext(++cext); if(mime_types->locate(0, sext.change_case(pool(), charsets.source(), String::CC_LOWER))) - if(StringPtr result=mime_types->item(1)) + if(const String& result=mime_types->item(1)) return result; else throw Exception("parser.runtime", @@ -672,9 +676,40 @@ StringPtr Request::mime_type_of(const ch MIME_TYPES_NAME " table column elements must not be empty"); } - return StringPtr(new String("application/octet-stream")); + return String* (new String("application/octet-stream")); } bool Request::origins_mode() { return main_class->get_element(origins_mode_name, *main_class, false)!=0; // $ORIGINS mode } + +#ifdef XML + +GdomeDOMString_auto_ptr Request::transcode(const String& s) { + return charsets.source().transcode(s); +} + +const String& Request::transcode(GdomeDOMString* s +#ifndef NO_STRING_ORIGIN + , const String& origin +#endif + ) { + return charsets.source().transcode(pool(), s +#ifndef NO_STRING_ORIGIN + , origin +#endif + ); +} + +const String& Request::transcode(xmlChar* s +#ifndef NO_STRING_ORIGIN + , const String& origin +#endif + ) { + return charsets.source().transcode(pool(), s +#ifndef NO_STRING_ORIGIN + , origin +#endif + ); +} +#endif