--- parser3/src/main/pa_request.C 2008/07/15 12:54:37 1.298 +++ parser3/src/main/pa_request.C 2009/08/08 13:30:21 1.308 @@ -1,11 +1,11 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2008/07/15 12:54:37 $"; +static const char * const IDENT_REQUEST_C="$Date: 2009/08/08 13:30:21 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -109,7 +109,9 @@ Request::Request(SAPI_Info& asapi_info, wcontext(0), flang(adefault_lang), fconnection(0), - finterrupted(false),fskip(SKIP_NOTHING), + finterrupted(false), + fskip(SKIP_NOTHING), + fin_cycle(0), // public #ifdef RESOURCES_DEBUG @@ -219,7 +221,7 @@ void Request::configure_admin(VStateless ... ] */ - if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { + if(Value* vcharsets=conf_class.get_element(charsets_name)) { if(!vcharsets->is_string()) if(HashStringValue* charsets=vcharsets->get_hash()) charsets->for_each(load_charset, &this->charsets); @@ -283,7 +285,7 @@ void Request::configure() { methoded_array().configure_user(*this); // $MAIN:MIME-TYPES - if(Value* element=main_class.get_element(mime_types_name, main_class, false)) + if(Value* element=main_class.get_element(mime_types_name)) if(Table *table=element->get_table()) mime_types=table; } @@ -388,16 +390,9 @@ gettimeofday(&mt[2],NULL); body_value=response.fields().get(body_name); // $response:body if(!body_value) body_value=new VString(*body_string); // just result of ^main[] - // ensure that body_value has no just L_TAINTED parts left - if(body_value->is_string()) - { - String& untainted=*new String(); - untainted.append(*body_value->get_string(), flang); - body_value=new VString(untainted); - } // @postprocess - if(Value* value=main_class.get_element(post_process_method_name, main_class, false)) + 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 @@ -405,12 +400,11 @@ gettimeofday(&mt[2],NULL); VMethodFrame frame(/*method->name, */ *junction, 0/*no parent*/); frame.set_self(main_class); - frame.store_param(*body_value); + frame.store_params(&body_value, 1); body_value=&execute_method(frame, *method).as_value(); } - VFile* body_file=body_value->as_vfile( - String::L_UNSPECIFIED, &charsets); + VFile* body_file=body_value->as_vfile(flang, &charsets); #ifdef RESOURCES_DEBUG //measure:after postprocess @@ -456,10 +450,7 @@ 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(UNHANDLED_EXCEPTION_METHOD_NAME), - main_class, - false)) { + if(Value* value=main_class.get_element(*new String(UNHANDLED_EXCEPTION_METHOD_NAME))) { if(Junction* junction=value->get_junction()) { if(const Method *method=junction->method) { // preparing to pass parameters to @@ -467,8 +458,6 @@ t[9]-t[3] VMethodFrame frame(/*method->name, */ *junction, 0/*no caller*/); frame.set_self(main_class); - // $exception - frame.store_param(details.vhash); // $stack[^table::create{name file lineno colno}] Table::columns_type stack_trace_columns(new ArrayString); *stack_trace_columns+=new String("name"); @@ -491,7 +480,8 @@ t[9]-t[3] stack_trace+=row; } - frame.store_param(*new VTable(&stack_trace)); + Value *params[]={&details.vhash, new VTable(&stack_trace)}; + frame.store_params(params, 2); // future $response:body= // execute ^unhandled_exception[exception;stack] @@ -512,7 +502,7 @@ t[9]-t[3] } VString body_vstring(*body_string); - VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); + VFile* body_file=body_vstring.as_vfile(flang, &charsets); // conditionally log it Value* vhandled=details.vhash.hash().get(exception_handled_part_name); @@ -559,7 +549,7 @@ void Request::use_file(VStateless_class& file_spec=&absolute(file_name); else { file_spec=0; - if(Value* element=main_class.get_element(class_path_name, main_class, false)) { + if(Value* element=main_class.get_element(class_path_name)) { if(element->is_string()) { file_spec=file_exist(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { @@ -670,14 +660,15 @@ static void add_header_attribute( || name==CHARSET_NAME) return; - const char* aname=String(name, String::L_URI).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets); + const char* aname=String(name, String::L_TAINTED).taint_cstr(String::L_URI, 0, &info->r.charsets); SAPI::add_header_attribute(info->r.sapi_info, - aname, - attributed_meaning_to_string(*value, String::L_URI, false).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets)); + aname, + attributed_meaning_to_string(*value, String::L_URI, false).untaint_cstr(String::L_AS_IS, 0, &info->r.charsets) + ); if(strcasecmp(aname, "last-modified")==0) - info->add_last_modified = false; + info->add_last_modified=false; } static void output_sole_piece(Request& r, @@ -882,7 +873,7 @@ void Request::output_result(VFile* body_ VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) { - if(Value* vdatep=v->as(VDATE_TYPE, false)) + if(Value* vdatep=v->as(VDATE_TYPE)) vdate=static_cast(vdatep); else throw Exception(PARSER_RUNTIME, 0, "mdate must be a date"); @@ -964,9 +955,7 @@ Request::Exception_details Request::get_ // $.source if(problem_source) { - String& source=*new String; - source.append(*problem_source, String::L_TAINTED, true/*forced*/); - + String& source=*new String(*problem_source, String::L_TAINTED); hash.put(exception_source_part_name, new VString(source)); } @@ -982,10 +971,10 @@ Request::Exception_details Request::get_ // $.comment if(const char* comment=e.comment(true)) hash.put(exception_comment_part_name, - new VString(*new String(comment, 0, true/*tainted*/))); + new VString(*new String(comment, String::L_TAINTED))); // $.handled(0) - hash.put(exception_handled_part_name, new VBool(false)); + hash.put(exception_handled_part_name, &VBool::get(false)); return Request::Exception_details(trace, problem_source, vhash); }