--- parser3/src/main/pa_request.C 2003/04/03 15:36:04 1.245.2.37.2.28 +++ parser3/src/main/pa_request.C 2003/11/19 11:00:33 1.254 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/04/03 15:36:04 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/11/19 11:00:33 $"; #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), @@ -132,8 +132,8 @@ Request::Request(SAPI_Info& asapi_info, mime_types(0) { // 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 +147,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 @@ -189,8 +191,11 @@ Request::~Request() { Value& Request::get_self() { return method_frame/*always have!*/->self(); } -static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) { - ::charsets.load_charset(*new String(akey, String::L_CLEAN), avalue->as_string()); +static void load_charset(HashStringValue::key_type akey, + HashStringValue::value_type avalue, + Request_charsets* charsets) { + 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) { if(configure_admin_done) @@ -210,7 +215,7 @@ void Request::configure_admin(VStateless if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { if(!vcharsets->is_string()) if(HashStringValue* charsets=vcharsets->get_hash()) - charsets->for_each(load_charset, 0); + charsets->for_each(load_charset, &this->charsets); else throw Exception("parser.runtime", 0, @@ -329,8 +334,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()) @@ -340,23 +351,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); @@ -453,7 +454,7 @@ 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(); i<=exception_trace.top_index(); i++) { + for(size_t i=exception_trace.bottom_index(); iget_hash()) body_file_content_type=hash->get(value_name); - if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) { - Charset::transcode( - charsets.source(), body_file->value_ptr(), body_file->value_size(), - charsets.client(), client_body, client_content_length - ); - } else { - client_body=body_file->value_ptr(); - client_content_length=body_file->value_size(); - } + String::C output(body_file->value_ptr(), body_file->value_size()); + if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) + output=Charset::transcode(output, + charsets.source(), + charsets.client()); // prepare header: content-length char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length); SAPI::add_header_attribute(sapi_info, "content-length", content_length_cstr); // send header @@ -686,14 +688,15 @@ void Request::output_result(VFile* body_ // send body if(!header_only) - SAPI::send_body(sapi_info, client_body, client_content_length); + SAPI::send_body(sapi_info, output.str, output.length); } 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(charsets.source(), String::CC_LOWER))) + Table::Action_options options; + if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER), options)) if(const String* result=mime_types->item(1)) return *result; else @@ -710,7 +713,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); } @@ -762,10 +765,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 @@ -778,5 +781,3 @@ Request::Exception_details Request::get_ return Request::Exception_details(trace, problem_source, vhash); } - -// \ No newline at end of file