|
|
| version 1.245.2.34, 2003/03/08 16:37:19 | version 1.245.2.37.2.4, 2003/03/20 09:41:46 |
|---|---|
| Line 27 static const char* IDENT_REQUEST_C="$Dat | Line 27 static const char* IDENT_REQUEST_C="$Dat |
| #include "pa_charsets.h" | #include "pa_charsets.h" |
| #include "pa_cache_managers.h" | #include "pa_cache_managers.h" |
| #include "pa_vmail.h" | #include "pa_vmail.h" |
| #include "pa_vform.h" | |
| #include "pa_vcookie.h" | |
| #include "pa_vresponse.h" | |
| // consts | // consts |
| Line 47 const char* ORIGINS_CONTENT_TYPE="text/p | Line 50 const char* ORIGINS_CONTENT_TYPE="text/p |
| // globals | // globals |
| StringPtr main_method_name(new String(MAIN_METHOD_NAME)); | const String& main_method_name(new String(MAIN_METHOD_NAME)); |
| StringPtr auto_method_name(new String(AUTO_METHOD_NAME)); | const String& auto_method_name(new String(AUTO_METHOD_NAME)); |
| StringPtr content_disposition_name(new String(CONTENT_DISPOSITION_NAME)); | const String& content_disposition_name(new String(CONTENT_DISPOSITION_NAME)); |
| StringPtr content_disposition_value(new String(CONTENT_DISPOSITION_VALUE)); | const String& content_disposition_value(new String(CONTENT_DISPOSITION_VALUE)); |
| StringPtr content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME)); | const String& content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME)); |
| StringPtr body_name(new String(BODY_NAME)); | const String& body_name(new String(BODY_NAME)); |
| // defines for statics | // defines for statics |
| Line 66 StringPtr body_name(new String(BODY_NAME | Line 69 StringPtr body_name(new String(BODY_NAME |
| // statics | // statics |
| static StringPtr charsets_name(new String(CHARSETS_NAME)); | static const String& charsets_name(new String(CHARSETS_NAME)); |
| static StringPtr main_class_name(new String(MAIN_CLASS_NAME)); | static const String& main_class_name(new String(MAIN_CLASS_NAME)); |
| static StringPtr mime_types_name(new String(MIME_TYPES_NAME)); | static const String& mime_types_name(new String(MIME_TYPES_NAME)); |
| static StringPtr origins_mode_name(new String(ORIGINS_MODE_NAME)); | static const String& origins_mode_name(new String(ORIGINS_MODE_NAME)); |
| static StringPtr conf_method_name(new String(CONF_METHOD_NAME)); | static const String& conf_method_name(new String(CONF_METHOD_NAME)); |
| static StringPtr post_process_method_name(new String(POST_PROCESS_METHOD_NAME)); | static const String& post_process_method_name(new String(POST_PROCESS_METHOD_NAME)); |
| static StringPtr download_name(new String(DOWNLOAD_NAME)); | static const String& download_name(new String(DOWNLOAD_NAME)); |
| static StringPtr class_path_name(new String(CLASS_PATH_NAME)); | static const String& class_path_name(new String(CLASS_PATH_NAME)); |
| // defines | // defines |
| // op.C | // op.C |
| VStateless_classPtr VClassMAIN_create(); | VStateless_classPtr VClassMAIN_create(); |
| // op.C | // 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, | Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, |
| String_UL adefault_lang, bool status_allowed): | Untaint_lang adefault_lang, bool status_allowed): |
| // private | // private |
| fpool(apool), | fpool(), |
| anti_endless_execute_recoursion(0), | anti_endless_execute_recoursion(0), |
| // public | // public |
| Line 111 Request::Request(Pool& apool, SAPI_Info& | Line 114 Request::Request(Pool& apool, SAPI_Info& |
| main_class(VClassMAIN_create()), | main_class(VClassMAIN_create()), |
| form(new VForm), | form(new VForm), |
| mail(new VMail), | mail(new VMail), |
| response(new VResponse(fpool, arequest_info, charsets)), | response(new VResponse(farequest_info, charsets)), |
| cookie(new VCookie), | cookie(new VCookie), |
| // private | // private |
| Line 134 Request::Request(Pool& apool, SAPI_Info& | Line 137 Request::Request(Pool& apool, SAPI_Info& |
| /// methodless | /// methodless |
| // env class | // env class |
| classes().put(StringPtr(new String(ENV_CLASS_NAME)), | classes().put(String* (new String(ENV_CLASS_NAME)), |
| ValuePtr(new VEnv(pool(), asapi_info))); | ValuePtr(new VEnv(pool(), asapi_info))); |
| // status class | // status class |
| if(status_allowed) | if(status_allowed) |
| classes().put(StringPtr(new String(STATUS_CLASS_NAME)), | classes().put(String* (new String(STATUS_CLASS_NAME)), |
| ValuePtr(new VStatus(pool()))); | ValuePtr(new VStatus())); |
| // request class | // request class |
| classes().put(StringPtr(new String(REQUEST_CLASS_NAME)), | classes().put(String* (new String(REQUEST_CLASS_NAME)), |
| ValuePtr(new VRequest(arequest_info, charsets))); | ValuePtr(new VRequest(arequest_info, charsets))); |
| // cookie class | // cookie class |
| classes().put(StringPtr(new String(COOKIE_CLASS_NAME)), cookie); | classes().put(String* (new String(COOKIE_CLASS_NAME)), cookie); |
| /// methoded | /// methoded |
| // response class | // response class |
| Line 177 ValuePtr Request::get_self() { return me | Line 180 ValuePtr Request::get_self() { return me |
| static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) { | static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) { |
| ::charsets.load_charset(akey, avalue->as_string(0)); | ::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) | if(configure_admin_done) |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| source, | source, |
| Line 194 void Request::configure_admin(VStateless | Line 197 void Request::configure_admin(VStateless |
| */ | */ |
| if(ValuePtr vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { | if(ValuePtr vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { |
| if(!vcharsets->is_string()) | 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); | charsets->for_each(load_charset, 0); |
| else | else |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Exception::undefined_source, | 0, |
| "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); | "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); |
| } | } |
| Line 231 gettimeofday(&mt[0],NULL); | Line 234 gettimeofday(&mt[0],NULL); |
| try { | try { |
| // loading config | // loading config |
| if(config_filespec) { | if(config_filespec) { |
| StringPtr filespec(new String); | const String& filespec(new String); |
| filespec->APPEND_CLEAN(config_filespec, 0, "config", 0); | filespec->APPEND_CLEAN(config_filespec, 0, "config", 0); |
| use_file(*main_class, | use_file(*main_class, |
| filespec, true/* ignore class_path */, | filespec, true/* ignore class_path */, |
| Line 252 gettimeofday(&mt[0],NULL); | Line 255 gettimeofday(&mt[0],NULL); |
| int step=0; | int step=0; |
| while(const char* before=strchr(after, '/')) { | while(const char* before=strchr(after, '/')) { |
| StringPtr sfile_spec(new String); | const String& sfile_spec(new String); |
| if(after!=request_info.path_translated) { | if(after!=request_info.path_translated) { |
| sfile_spec->APPEND_CLEAN( | sfile_spec->APPEND_CLEAN( |
| request_info.path_translated, before-request_info.path_translated, | request_info.path_translated, before-request_info.path_translated, |
| Line 268 gettimeofday(&mt[0],NULL); | Line 271 gettimeofday(&mt[0],NULL); |
| } | } |
| // compile requested file | // 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); | spath_translated->APPEND_TAINTED(request_info.path_translated, 0, "user-request", 0); |
| use_file(*main_class, | use_file(*main_class, |
| spath_translated, true/* ignore class_path */, | spath_translated, true/* ignore class_path */, |
| Line 276 gettimeofday(&mt[0],NULL); | Line 279 gettimeofday(&mt[0],NULL); |
| // configure method_frame options if not configured yet | // configure method_frame options if not configured yet |
| if(!configure_admin_done) | if(!configure_admin_done) |
| configure_admin(*main_class, StringPtr(0)); | configure_admin(*main_class, 0); |
| // configure not-method_frame=user options | // configure not-method_frame=user options |
| methoded_array().configure_user(*this); | methoded_array().configure_user(*this); |
| Line 293 gettimeofday(&mt[0],NULL); | Line 296 gettimeofday(&mt[0],NULL); |
| cookie->fill_fields(pool(), request_info); | cookie->fill_fields(pool(), request_info); |
| // filling mail received | // filling mail received |
| mail->fill_received(pool(), request_info); | mail->fill_received(*this); |
| #ifdef RESOURCES_DEBUG | #ifdef RESOURCES_DEBUG |
| //measure:after compile | //measure:after compile |
| gettimeofday(&mt[1],NULL); | gettimeofday(&mt[1],NULL); |
| #endif | #endif |
| // execute @main[] | // 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) | if(!body_string) |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Exception::undefined_source, | 0, |
| "'"MAIN_METHOD_NAME"' method not found"); | "'"MAIN_METHOD_NAME"' method not found"); |
| #ifdef RESOURCES_DEBUG | #ifdef RESOURCES_DEBUG |
| Line 311 gettimeofday(&mt[1],NULL); | Line 314 gettimeofday(&mt[1],NULL); |
| gettimeofday(&mt[2],NULL); | gettimeofday(&mt[2],NULL); |
| #endif | #endif |
| VStringPtr body_vstring_before_post_process(new VString(body_string)); | Vconst String& body_vstring_before_post_process(new VString(body_string)); |
| VStringPtr body_vstring_after_post_process(body_vstring_before_post_process); | Vconst String& body_vstring_after_post_process(body_vstring_before_post_process); |
| // @postprocess | // @postprocess |
| if(ValuePtr value=main_class->get_element(post_process_method_name, *main_class, false)) | if(ValuePtr value=main_class->get_element(post_process_method_name, *main_class, false)) |
| if(JunctionPtr junction=value->get_junction()) | if(JunctionPtr junction=value->get_junction()) |
| Line 324 gettimeofday(&mt[2],NULL); | Line 327 gettimeofday(&mt[2],NULL); |
| frame.store_param(body_vstring_before_post_process); | frame.store_param(body_vstring_before_post_process); |
| body_vstring_after_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(); | bool lorigins_mode=origins_mode(); |
| Line 339 gettimeofday(&mt[2],NULL); | Line 342 gettimeofday(&mt[2],NULL); |
| body_value=response->fields().get(body_name); | body_value=response->fields().get(body_name); |
| if(body_value) // there is some $response:body | 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) | else if(lorigins_mode) |
| response->fields().put(content_type_name, | 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 | #ifdef RESOURCES_DEBUG |
| //measure:after postprocess | //measure:after postprocess |
| Line 374 t[9]-t[3] | Line 377 t[9]-t[3] |
| // we're returning not result, but error explanation | // we're returning not result, but error explanation |
| try { | try { |
| // log the beast | // log the beast |
| if(StringPtr problem_source=e.problem_source()) | if(const String* problem_source=e.problem_source()) |
| SAPI::log(sapi_info, | SAPI::log(sapi_info, |
| "%s: " | "%s: " |
| #ifndef NO_STRING_ORIGIN | #ifndef NO_STRING_ORIGIN |
| Line 405 t[9]-t[3] | Line 408 t[9]-t[3] |
| response->fields().clear(); | response->fields().clear(); |
| // this is what we'd return in $response:body | // 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 | // maybe we'd be lucky enough as to report an error |
| // in a gracefull way... | // in a gracefull way... |
| if(ValuePtr value=main_class->get_element( | if(ValuePtr value=main_class->get_element( |
| StringPtr(new String(UNHANDLED_EXCEPTION_METHOD_NAME)), | String* (new String(UNHANDLED_EXCEPTION_METHOD_NAME)), |
| *main_class, | *main_class, |
| false)) { | false)) { |
| if(JunctionPtr junction=value->get_junction()) { | if(JunctionPtr junction=value->get_junction()) { |
| Line 424 t[9]-t[3] | Line 427 t[9]-t[3] |
| frame.store_param(exception2vhash(pool(), e)); | frame.store_param(exception2vhash(pool(), e)); |
| // $stack[^table::set{name origin}] | // $stack[^table::set{name origin}] |
| Table::columns_type stack_trace_columns(new ArrayString); | Table::columns_type stack_trace_columns(new ArrayString); |
| *stack_trace_columns+=StringPtr(new String("name")); | *stack_trace_columns+=String* (new String("name")); |
| *stack_trace_columns+=StringPtr(new String("file")); | *stack_trace_columns+=String* (new String("file")); |
| *stack_trace_columns+=StringPtr(new String("lineno")); | *stack_trace_columns+=String* (new String("lineno")); |
| TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); | Table* stack_trace(new Table(0, stack_trace_columns)); |
| Array_iterator<StringPtr> tracei(exception_trace); | Array_iterator<String* > tracei(exception_trace); |
| while(tracei.has_next()) { | while(tracei.has_next()) { |
| Table::element_type row(new ArrayString); | Table::element_type row(new ArrayString); |
| StringPtr name=tracei.next(); | const String& name=tracei.next(); |
| *row+=name; // name column | *row+=name; // name column |
| #ifndef NO_STRING_ORIGIN | #ifndef NO_STRING_ORIGIN |
| const String_fragment::Origin& origin=name->origin(); | const String_fragment::Origin& origin=name->origin(); |
| if(origin.file) { | if(origin.file) { |
| *row+=StringPtr(new String(origin.file, 0, true)); // file column | *row+=String* (new String(origin.file, 0, true)); // file column |
| *row+=StringPtr(new String( | *row+=String* (new String( |
| pool().format_integer(1+origin.line), | pool().format_integer(1+origin.line), |
| 0, true)); // line column | 0, true)); // line column |
| } | } |
| Line 458 t[9]-t[3] | Line 461 t[9]-t[3] |
| // doing that ugly | // doing that ugly |
| // make up result: $origin $source $comment $type $code | // make up result: $origin $source $comment $type $code |
| char *buf=new(pool()) char[MAX_STRING]; | char *buf=new char[MAX_STRING]; |
| size_t printed=0; | size_t printed=0; |
| if(StringPtr problem_source=e.problem_source()) { | if(const String* problem_source=e.problem_source()) { |
| #ifndef NO_STRING_ORIGIN | #ifndef NO_STRING_ORIGIN |
| const String_fragment::Origin& origin=problem_source->origin(); | const String_fragment::Origin& origin=problem_source->origin(); |
| if(origin.file) | if(origin.file) |
| Line 479 t[9]-t[3] | Line 482 t[9]-t[3] |
| // future $response:content-type | // future $response:content-type |
| response->fields().put(content_type_name, | 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 | // future $response:body |
| body_string=StringPtr(new String(buf)); | body_string=String* (new String(buf)); |
| } | } |
| VString body_vstring(body_string); | VString body_vstring(body_string); |
| VFilePtr body_file=body_vstring.as_vfile(pool()); | VFilePtr body_file=body_vstring.as_vfile(); |
| // ERROR. write it out | // ERROR. write it out |
| output_result(body_file, header_only, false); | output_result(body_file, header_only, false); |
| Line 495 t[9]-t[3] | Line 498 t[9]-t[3] |
| } | } |
| } | } |
| VStateless_classPtr Request::use_file(VStateless_class& aclass, | void Request::use_file(VStateless_class& aclass, |
| StringPtr file_name, bool ignore_class_path, | const String& file_name, bool ignore_class_path, |
| bool fail_on_read_problem, bool fail_on_file_absence) { | bool fail_on_read_problem, bool fail_on_file_absence) { |
| // cyclic dependence check | // cyclic dependence check |
| if(used_files.get(file_name)) | if(used_files.get(file_name)) |
| return VStateless_classPtr(0); | return; |
| used_files.put(file_name, true); | used_files.put(file_name, true); |
| StringPtr file_spec; | const String& file_spec; |
| if(ignore_class_path) // ignore_class_path? | if(ignore_class_path) // ignore_class_path? |
| file_spec=file_name; | file_spec=file_name; |
| else if(file_name->first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH? | else if(file_name->first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH? |
| file_spec=absolute(file_name); | file_spec=absolute(file_name); |
| else { | else { |
| file_spec=StringPtr(0); | file_spec=0; |
| if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) { | if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) { |
| if(element->is_string()) { | if(element->is_string()) { |
| file_spec=file_readable(*absolute(element->as_string(&pool())), *file_name); // found at class_path? | file_spec=file_readable(*absolute(element->as_string(&pool())), *file_name); // found at class_path? |
| } else if(Table *table=element->get_table()) { | } else if(Table *table=element->get_table()) { |
| int size=table->count(); | int size=table->count(); |
| for(int i=size; i--; ) { | 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)) | if(file_spec=file_readable(*absolute(path), *file_name)) |
| break; // found along class_path | break; // found along class_path |
| } | } |
| } else | } else |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Exception::undefined_source, | 0, |
| "$" CLASS_PATH_NAME " must be string or table"); | "$" CLASS_PATH_NAME " must be string or table"); |
| if(!file_spec) | if(!file_spec) |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Line 537 VStateless_classPtr Request::use_file(VS | Line 540 VStateless_classPtr Request::use_file(VS |
| if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for | if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for |
| if(!entry_exists(file_spec)) | 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)) | 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())); | use_buf(aclass, source, file_spec, file_spec->cstr()); |
| else | |
| return VStateless_classPtr(0); | |
| } | } |
| VStateless_classPtr Request::use_buf(VStateless_class& aclass, | void Request::use_buf(VStateless_class& aclass, |
| const char* source, | 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 | // temporary zero @conf so to maybe-replace it in compiled code |
| Temp_method temp_method_conf(aclass, conf_method_name, MethodPtr(0)); | Temp_method temp_method_conf(aclass, conf_method_name, MethodPtr(0)); |
| // temporary zero @auto so to maybe-replace it in compiled code | // temporary zero @auto so to maybe-replace it in compiled code |
| Line 558 VStateless_classPtr Request::use_buf(VSt | Line 559 VStateless_classPtr Request::use_buf(VSt |
| VStateless_class& cclass=COMPILE(&aclass, source, filespec_cstr); | VStateless_class& cclass=COMPILE(&aclass, source, filespec_cstr); |
| // locate and execute possible @conf[] static | // locate and execute possible @conf[] static |
| VStringPtr vfilespec(new VString(filespec)); | Vconst String& vfilespec(new VString(filespec)); |
| Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, | Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, |
| conf_method_name, vfilespec, | conf_method_name, vfilespec, |
| false/*no string result needed*/); | false/*no string result needed*/); |
| Line 569 VStateless_classPtr Request::use_buf(VSt | Line 570 VStateless_classPtr Request::use_buf(VSt |
| execute_nonvirtual_method(cclass, | execute_nonvirtual_method(cclass, |
| auto_method_name, vfilespec, | auto_method_name, vfilespec, |
| false/*no result needed*/); | 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); | char *hpath=pool().copy(apath); |
| StringPtr result(new String); | const String& result(new String); |
| if(rsplit(hpath, '/')) // if something/splitted | if(rsplit(hpath, '/')) // if something/splitted |
| *result << hpath << "/"; | *result << hpath << "/"; |
| *result << relative_name; | *result << relative_name; |
| return result; | return result; |
| } | } |
| StringPtr Request::absolute(StringPtr relative_name) { | const String& Request::absolute(const String& relative_name) { |
| if(relative_name->first_char()=='/') { | 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; | *result << relative_name; |
| return result; | return result; |
| } else | } else |
| Line 617 void Request::output_result(VFilePtr bod | Line 617 void Request::output_result(VFilePtr bod |
| } else { | } else { |
| // default content type | // default content type |
| response->fields().put_dont_replace(content_type_name, | 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 | // content-disposition |
| if(ValuePtr vfile_name=body_file->fields().get(name_name)) | if(ValuePtr vfile_name=body_file->fields().get(name_name)) |
| if(*vfile_name->get_string(&fpool)!=NONAME_DAT) { | if(*vfile_name->get_string(&fpool)!=NONAME_DAT) { |
| VHashPtr hash(new VHash); | VHashPtr hash(new VHash); |
| HashStringValue &h=hash->hash(Exception::undefined_source); | HashStringValue &h=hash->hash(0); |
| if(as_attachment) | if(as_attachment) |
| h.put(value_name, ValuePtr(new VString(content_disposition_value))); | h.put(value_name, ValuePtr(new VString(content_disposition_value))); |
| h.put(content_disposition_filename_name, vfile_name); | h.put(content_disposition_filename_name, vfile_name); |
| Line 638 void Request::output_result(VFilePtr bod | Line 638 void Request::output_result(VFilePtr bod |
| size_t client_content_length; | size_t client_content_length; |
| // transcode text body when "text/*" or simple result | // transcode text body when "text/*" or simple result |
| if(body_file_content_type) | 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); | 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) { | if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string(&pool())->pos("text/")==0) { |
| Charset::transcode(pool(), | Charset::transcode(pool(), |
| Line 663 void Request::output_result(VFilePtr bod | Line 663 void Request::output_result(VFilePtr bod |
| SAPI::send_body(sapi_info, client_body, client_content_length); | 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(mime_types) |
| if(const char* cext=strrchr(user_file_name_cstr, '.')) { | if(const char* cext=strrchr(user_file_name_cstr, '.')) { |
| String sext(++cext); | String sext(++cext); |
| if(mime_types->locate(0, sext.change_case(pool(), charsets.source(), String::CC_LOWER))) | 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; | return result; |
| else | else |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Line 676 StringPtr Request::mime_type_of(const ch | Line 676 StringPtr Request::mime_type_of(const ch |
| MIME_TYPES_NAME " table column elements must not be empty"); | 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() { | bool Request::origins_mode() { |
| Line 685 bool Request::origins_mode() { | Line 685 bool Request::origins_mode() { |
| #ifdef XML | #ifdef XML |
| GdomeDOMString_auto_ptr Request::transcode(StringPtr s) { | GdomeDOMString_auto_ptr Request::transcode(const String& s) { |
| return charsets.source().transcode(s); | return charsets.source().transcode(s); |
| } | } |
| StringPtr Request::transcode(GdomeDOMString* s | const String& Request::transcode(GdomeDOMString* s |
| #ifndef NO_STRING_ORIGIN | #ifndef NO_STRING_ORIGIN |
| , StringPtr origin | , const String& origin |
| #endif | #endif |
| ) { | ) { |
| return charsets.source().transcode(pool(), s | return charsets.source().transcode(pool(), s |
| Line 701 StringPtr Request::transcode(GdomeDOMStr | Line 701 StringPtr Request::transcode(GdomeDOMStr |
| ); | ); |
| } | } |
| StringPtr Request::transcode(xmlChar* s | const String& Request::transcode(xmlChar* s |
| #ifndef NO_STRING_ORIGIN | #ifndef NO_STRING_ORIGIN |
| , StringPtr origin | , const String& origin |
| #endif | #endif |
| ) { | ) { |
| return charsets.source().transcode(pool(), s | return charsets.source().transcode(pool(), s |