--- parser3/src/main/pa_request.C 2003/07/24 11:31:24 1.248 +++ parser3/src/main/pa_request.C 2003/12/11 09:36:51 1.263 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/07/24 11:31:24 $"; +static const char * const IDENT_REQUEST_C="$Date: 2003/12/11 09:36:51 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -31,6 +31,7 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vcookie.h" #include "pa_vresponse.h" #include "pa_vmemory.h" +#include "pa_vconsole.h" // consts @@ -51,7 +52,6 @@ const char* ORIGINS_CONTENT_TYPE="text/p #define EXCEPTION_TYPE_PART_NAME "type" #define EXCEPTION_SOURCE_PART_NAME "source" #define EXCEPTION_COMMENT_PART_NAME "comment" -#define EXCEPTION_HANDLED_PART_NAME "handled" // globals @@ -94,7 +94,7 @@ VStateless_class& VClassMAIN_create(); // Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, - String::Language adefault_lang, bool status_allowed): + String::Language adefault_lang, bool status_allowed): // private anti_endless_execute_recoursion(0), @@ -113,12 +113,12 @@ Request::Request(SAPI_Info& asapi_info, #endif // public - sapi_info(asapi_info), request_info(arequest_info), + sapi_info(asapi_info), charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets main_class(VClassMAIN_create()), - form(*new VForm), + form(*new VForm(charsets, arequest_info)), mail(*new VMail), response(*new VResponse(arequest_info, charsets)), cookie(*new VCookie), @@ -131,9 +131,11 @@ Request::Request(SAPI_Info& asapi_info, // private mime types mime_types(0) { + pa_register_thread_request(*this); + // file_no=0 => unknown - file_list+=StringBody("UNKNOWN"); - file_list+=StringBody("-body of process-"); // pseudo_file_no__process + file_list+=String::Body("UNKNOWN"); + file_list+=String::Body("-body of process-"); // pseudo_file_no__process // maybe expire old caches cache_managers.maybe_expire(); @@ -147,14 +149,16 @@ Request::Request(SAPI_Info& asapi_info, /// methodless // env class - classes().put(StringBody(ENV_CLASS_NAME), new VEnv(asapi_info)); + classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info)); // status class if(status_allowed) - classes().put(StringBody(STATUS_CLASS_NAME), new VStatus()); + classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); // request class - classes().put(StringBody(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); + classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); // cookie class - classes().put(StringBody(COOKIE_CLASS_NAME), &cookie); + classes().put(String::Body(COOKIE_CLASS_NAME), &cookie); + // console class + classes().put(String::Body(CONSOLE_CLASS_NAME), new VConsole()); /// methoded // response class @@ -192,7 +196,7 @@ Value& Request::get_self() { return meth static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, Request_charsets* charsets) { - const StringBody NAME=String(akey, String::L_CLEAN).change_case(charsets->source(), String::CC_UPPER); + const String::Body NAME=String(akey, String::L_CLEAN).change_case(charsets->source(), String::CC_UPPER); ::charsets.load_charset(*charsets, NAME, avalue->as_string()); } void Request::configure_admin(VStateless_class& conf_class) { @@ -267,7 +271,6 @@ gettimeofday(&mt[0],NULL); --after; } - int step=0; while(const char* before=strchr(after, '/')) { String& sfile_spec=*new String; if(after!=request_info.path_translated) { @@ -307,9 +310,6 @@ gettimeofday(&mt[0],NULL); if(Table *table=element->get_table()) mime_types=table; - // filling form fields - form.fill_fields_and_tables(charsets, request_info); - // filling cookies cookie.fill_fields(request_info); @@ -332,8 +332,14 @@ gettimeofday(&mt[1],NULL); gettimeofday(&mt[2],NULL); #endif - VString& body_vstring_before_post_process=*new VString(*body_string); - VString* body_vstring_after_post_process=&body_vstring_before_post_process; + // extract response body + Value* body_value=response.fields().get(download_name); // $response:download? + bool as_attachment=body_value!=0; + if(!body_value) + body_value=response.fields().get(body_name); // $response:body + if(!body_value) + body_value=new VString(*body_string); // just result of ^main[] + // @postprocess if(Value* value=main_class.get_element(post_process_method_name, main_class, false)) if(Junction* junction=value->get_junction()) @@ -343,23 +349,13 @@ gettimeofday(&mt[2],NULL); VMethodFrame frame(/*method->name, */ *junction, 0/*no parent*/); frame.set_self(main_class); - frame.store_param(body_vstring_before_post_process); - body_vstring_after_post_process= - new VString(execute_method(frame, *method)); + frame.store_param(*body_value); + body_value=&execute_method(frame, *method).as_value(); } - VFile* body_file=body_vstring_after_post_process->as_vfile( + VFile* body_file=body_value->as_vfile( String::L_UNSPECIFIED, &charsets); - // extract response body - Value* body_value=response.fields().get(download_name); - bool as_attachment=body_value!=0; - if(!body_value) - body_value=response.fields().get(body_name); - - if(body_value) // there is some $response:body - body_file=body_value->as_vfile(String::L_UNSPECIFIED, &charsets); - #ifdef RESOURCES_DEBUG //measure:after postprocess gettimeofday(&mt[3],NULL); @@ -388,59 +384,58 @@ t[9]-t[3] #endif } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation -// try { #define PA_URI_FORMAT "%s: " #define PA_ORIGIN_FILE_POS_FORMAT "%s(%d:%d): " #define PA_SOURCE_FORMAT "'%s' " #define PA_COMMENT_TYPE_FORMAT "%s [%s]" - // log the beast - Request::Exception_details details=get_details(e); + // log the beast + Request::Exception_details details=get_details(e); - if(details.problem_source) { // do we know the guy? - if(details.trace) { // do whe know where he came from? - Operation::Origin origin=details.trace.origin(); - SAPI::log(sapi_info, - PA_URI_FORMAT - PA_ORIGIN_FILE_POS_FORMAT - PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, - request_info.uri, - file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col, - details.problem_source->cstr(), - e.comment(), e.type() - ); - } else - SAPI::log(sapi_info, - PA_URI_FORMAT - PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, - request_info.uri, - details.problem_source->cstr(), - e.comment(), e.type() - ); + if(details.problem_source) { // do we know the guy? + if(details.trace) { // do whe know where he came from? + Operation::Origin origin=details.trace.origin(); + SAPI::log(sapi_info, + PA_URI_FORMAT + PA_ORIGIN_FILE_POS_FORMAT + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, + request_info.uri, + file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col, + details.problem_source->cstr(), + e.comment(), e.type() + ); } else SAPI::log(sapi_info, PA_URI_FORMAT - PA_COMMENT_TYPE_FORMAT, + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, request_info.uri, + details.problem_source->cstr(), e.comment(), e.type() ); - - // reset language to default - flang=fdefault_lang; - - // reset response - response.fields().clear(); - - // this is what we'd return in $response:body - const String* body_string=0; - - // maybe we'd be lucky enough as to report an error - // in a gracefull way... - if(Value* value=main_class.get_element( - *new String(UNHANDLED_EXCEPTION_METHOD_NAME), - main_class, - false)) { - if(Junction* junction=value->get_junction()) { - if(const Method *method=junction->method) { + } else + SAPI::log(sapi_info, + PA_URI_FORMAT + PA_COMMENT_TYPE_FORMAT, + request_info.uri, + e.comment(), e.type() + ); + + // reset language to default + flang=fdefault_lang; + + // reset response + response.fields().clear(); + + // this is what we'd return in $response:body + const String* body_string=0; + + // maybe we'd be lucky enough as to report an error + // in a gracefull way... + if(Value* value=main_class.get_element( + *new String(UNHANDLED_EXCEPTION_METHOD_NAME), + main_class, + false)) { + if(Junction* junction=value->get_junction()) { + if(const Method *method=junction->method) { // preparing to pass parameters to // @unhandled_exception[exception;stack] VMethodFrame frame(/*method->name, */ *junction, 0/*no caller*/); @@ -456,69 +451,58 @@ Table::columns_type stack_trace_columns( *stack_trace_columns+=new String("colno"); Table& stack_trace=*new Table(stack_trace_columns); if(!exception_trace.is_empty()/*signed!*/) - for(size_t i=exception_trace.bottom_index(); iorigin(); - if(origin.file) - printed+=snprintf(buf+printed, MAX_STRING-printed, - PA_ORIGIN_FILE_POS_FORMAT, - origin.file, 1+origin.line - ); - printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr().get()); - */ +body_string=&execute_method(frame, *method).as_string(); } - 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, - new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); - // future $response:body - body_string=new String(buf); } + } + + if(!body_string) { // couldn't report an error beautifully? + // doing that ugly + + // make up result: $origin $source $comment $type $code + char *buf=new(PointerFreeGC) char[MAX_STRING]; + size_t printed=0; + if(const String* problem_source=e.problem_source()) + printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", + 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, + new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); + // future $response:body + body_string=new String(buf); + } - VString body_vstring(*body_string); - VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); + VString body_vstring(*body_string); + VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); - // ERROR. write it out - output_result(body_file, header_only, false); -// } catch(const Exception& ) { -// rethrow; -// } + // ERROR. write it out + output_result(body_file, header_only, false); } } -size_t Request::register_file(StringBody file_spec) { +size_t Request::register_file(String::Body file_spec) { file_list+=file_spec; return file_list.count()-1; } @@ -547,7 +531,7 @@ void Request::use_file(VStateless_class& int size=table->count(); for(int i=size; i--; ) { 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 } } else @@ -647,7 +631,7 @@ void Request::output_result(VFile* body_ Value* body_file_content_type; // set content-type - if(body_file_content_type=body_file->fields().get(content_type_name)) { + if((body_file_content_type=body_file->fields().get(content_type_name))) { // body file content type response.fields().put(content_type_name, body_file_content_type); } else { @@ -715,7 +699,7 @@ GdomeDOMString_auto_ptr Request::transco return charsets.source().transcode(s); } -GdomeDOMString_auto_ptr Request::transcode(const StringBody s) { +GdomeDOMString_auto_ptr Request::transcode(const String::Body s) { return charsets.source().transcode(s); } @@ -767,10 +751,10 @@ Request::Exception_details Request::get_ // $.file lineno colno if(trace) { const Operation::Origin origin=trace.origin(); - hash.put(StringBody("file"), + hash.put(String::Body("file"), new VString(*new String(file_list[origin.file_no], String::L_TAINTED))); - hash.put(StringBody("lineno"), new VInt(1+origin.line)); - hash.put(StringBody("colno"), new VInt(1+origin.col)); + hash.put(String::Body("lineno"), new VInt(1+origin.line)); + hash.put(String::Body("colno"), new VInt(1+origin.col)); } // $.comment