--- parser3/src/main/pa_request.C 2003/02/03 09:21:00 1.245.2.9 +++ parser3/src/main/pa_request.C 2003/02/14 17:38:29 1.245.2.19 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/02/03 09:21:00 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/02/14 17:38:29 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -37,22 +37,25 @@ const char* ORIGINS_CONTENT_TYPE="text/p // defines for globals #define MAIN_METHOD_NAME "main" +#define AUTO_METHOD_NAME "auto" +#define BODY_NAME "body" // 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)); // defines for statics #define CHARSETS_NAME "CHARSETS" -#define MAIN_CLASS_NAME "MAIN" #define MIME_TYPES_NAME "MIME-TYPES" #define ORIGINS_MODE_NAME "ORIGINS" -#define AUTO_FILE_NAME "auto.p" #define CONF_METHOD_NAME "conf" -#define AUTO_METHOD_NAME "auto" #define POST_PROCESS_METHOD_NAME "postprocess" -#define BODY_NAME "body" #define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" @@ -63,9 +66,7 @@ static StringPtr main_class_name(new Str 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 auto_method_name(new String(AUTO_METHOD_NAME)); static StringPtr post_process_method_name(new String(POST_PROCESS_METHOD_NAME)); -static StringPtr body_name(new String(BODY_NAME)); static StringPtr download_name(new String(DOWNLOAD_NAME)); static StringPtr class_path_name(new String(CLASS_PATH_NAME)); @@ -74,7 +75,7 @@ static StringPtr class_path_name(new Str // op.C VStateless_classPtr VClassMAIN_create(); // op.C -VHashPtr exception2vhash(const Exception& e); +VHashPtr exception2vhash(Pool& pool, const Exception& e); void lock_system_class(HashStringValue::key_type key, HashStringValue::value_type value, int) { if(VStateless_class *value_class=value->get_class()) @@ -82,8 +83,9 @@ void lock_system_class(HashStringValue:: } // -Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, +Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, uchar adefault_lang, bool status_allowed): + fpool(apool), sapi_info(asapi_info), request_info(arequest_info), fdefault_lang(adefault_lang), flang(adefault_lang), @@ -91,7 +93,7 @@ Request::Request(SAPI_Info& asapi_info, main_class(VClassMAIN_create()), charsets(pool(), *UTF8_charset, *UTF8_charset, *UTF8_charset), // default charsets - response(new VResponse(arequest_info, charsets)), + response(new VResponse(fpool, arequest_info, charsets)), form(new VForm), mail(new VMail), cookie(new VCookie) @@ -113,7 +115,7 @@ Request::Request(SAPI_Info& asapi_info, // status class if(status_allowed) classes().put(StringPtr(new String(STATUS_CLASS_NAME)), - ValuePtr(new VStatus)); + ValuePtr(new VStatus(pool()))); // request class classes().put(StringPtr(new String(REQUEST_CLASS_NAME)), ValuePtr(new VRequest(arequest_info, charsets))); @@ -267,7 +269,7 @@ gettimeofday(&mt[0],NULL); mime_types=table; // filling form fields - form->fill_fields_and_tables(charsets, request_info); + form->fill_fields_and_tables(pool(), charsets, request_info); // filling cookies cookie->fill_fields(pool(), request_info); @@ -309,7 +311,7 @@ gettimeofday(&mt[2],NULL); bool lorigins_mode=origins_mode(); - VFilePtr body_file=body_vstring_after_post_process->as_vfile( + VFilePtr body_file=body_vstring_after_post_process->as_vfile(pool(), String::UL_UNSPECIFIED, lorigins_mode); // extract response body @@ -366,7 +368,7 @@ t[9]-t[3] problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(), + problem_source->cstr().get(), e.comment(), e.type() ); @@ -401,7 +403,7 @@ t[9]-t[3] frame.set_self(main_class); // $exception - frame.store_param(exception2vhash(e)); + frame.store_param(exception2vhash(pool(), e)); // $stack[^table::set{name origin}] Table::columns_type stack_trace_columns; *stack_trace_columns+=StringPtr(new String("name")); @@ -450,7 +452,7 @@ t[9]-t[3] ); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr()); + problem_source->cstr().get()); } if(const char* comment=e.comment(true)) printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); @@ -465,7 +467,7 @@ t[9]-t[3] } VString body_vstring(body_string); - VFilePtr body_file=body_vstring.as_vfile(); + VFilePtr body_file=body_vstring.as_vfile(pool()); // ERROR. write it out output_result(body_file, header_only, false); @@ -480,7 +482,7 @@ VStateless_classPtr Request::use_file(VS bool fail_on_read_problem, bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_name)) - return 0; + return VStateless_classPtr(0); used_files.put(file_name, true); StringPtr file_spec; @@ -492,12 +494,12 @@ VStateless_classPtr Request::use_file(VS file_spec=StringPtr(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? + 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]; - if(file_spec=file_readable(absolute(path), file_name)) + if(file_spec=file_readable(*absolute(path), *file_name)) break; // found along class_path } } else @@ -517,12 +519,12 @@ 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 0; + return VStateless_classPtr(0); 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 0; + return VStateless_classPtr(0); } @@ -550,7 +552,7 @@ VStateless_classPtr Request::use_buf(VSt execute_nonvirtual_method(cclass, auto_method_name, vfilespec, 0/*no result needed*/); - return &cclass; + return VStateless_classPtr(&cclass); } StringPtr Request::relative(const char* apath, StringPtr relative_name) { @@ -588,7 +590,7 @@ static void add_header_attribute( } void Request::output_result(VFilePtr body_file, bool header_only, bool as_attachment) { // header: cookies - cookie->output_result(sapi_info); + cookie->output_result(pool(), sapi_info); ValuePtr body_file_content_type; // set content-type @@ -603,7 +605,7 @@ void Request::output_result(VFilePtr bod // content-disposition if(ValuePtr vfile_name=body_file->fields().get(name_name)) - if(*vfile_name->get_string(&Pool())!=NONAME_DAT) { + if(*vfile_name->get_string(&fpool)!=NONAME_DAT) { VHashPtr hash(new VHash); HashStringValue &h=hash->hash(Exception::undefined_source); if(as_attachment)