--- parser3/src/main/pa_request.C 2003/12/11 10:25:52 1.264 +++ parser3/src/main/pa_request.C 2009/04/16 01:09:54 1.299 @@ -1,11 +1,11 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2003 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: 2003/12/11 10:25:52 $"; +static const char * const IDENT_REQUEST_C="$Date: 2009/04/16 01:09:54 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -32,10 +32,11 @@ static const char * const IDENT_REQUEST_ #include "pa_vresponse.h" #include "pa_vmemory.h" #include "pa_vconsole.h" +#include "pa_vdate.h" // consts -const char* UNHANDLED_EXCEPTION_METHOD_NAME="unhandled_exception"; +#define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception" /// content type of exception response, when no @MAIN:exception handler defined const char* UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -57,8 +58,10 @@ const char* ORIGINS_CONTENT_TYPE="text/p const String main_method_name(MAIN_METHOD_NAME); const String auto_method_name(AUTO_METHOD_NAME); +const String content_transfer_encoding_name(CONTENT_TRANSFER_ENCODING_NAME); const String content_disposition_name(CONTENT_DISPOSITION_NAME); -const String content_disposition_value(CONTENT_DISPOSITION_VALUE); +const String content_disposition_inline(CONTENT_DISPOSITION_INLINE); +const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT); const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME); const String body_name(BODY_NAME); const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME); @@ -75,6 +78,7 @@ const String exception_handled_part_name #define POST_PROCESS_METHOD_NAME "postprocess" #define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" +#define RESPONSE_BODY_FILE_NAME "file" // statics @@ -86,6 +90,7 @@ static const String conf_method_name(CON static const String post_process_method_name(POST_PROCESS_METHOD_NAME); static const String download_name(DOWNLOAD_NAME); static const String class_path_name(CLASS_PATH_NAME); +static const String response_body_file_name(RESPONSE_BODY_FILE_NAME); // defines @@ -104,7 +109,7 @@ Request::Request(SAPI_Info& asapi_info, wcontext(0), flang(adefault_lang), fconnection(0), - finterrupted(false), + finterrupted(false),fskip(SKIP_NOTHING), // public #ifdef RESOURCES_DEBUG @@ -121,7 +126,8 @@ Request::Request(SAPI_Info& asapi_info, form(*new VForm(charsets, arequest_info)), mail(*new VMail), response(*new VResponse(arequest_info, charsets)), - cookie(*new VCookie), + cookie(*new VCookie(charsets, arequest_info)), + console(*new VConsole), // private configure_admin_done(false), @@ -154,12 +160,11 @@ Request::Request(SAPI_Info& asapi_info, if(status_allowed) classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); // request class - classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); + classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets, form)); // cookie class classes().put(String::Body(COOKIE_CLASS_NAME), &cookie); // console class - classes().put(String::Body(CONSOLE_CLASS_NAME), new VConsole()); - + classes().put(String::Body(CONSOLE_CLASS_NAME), &console); /// methoded // response class classes().put(response.get_class()->name(), &response); @@ -201,7 +206,7 @@ static void load_charset(HashStringValue } void Request::configure_admin(VStateless_class& conf_class) { if(configure_admin_done) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "parser already configured"); configure_admin_done=true; @@ -217,9 +222,9 @@ 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, &this->charsets); + charsets->for_each(load_charset, &this->charsets); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); } @@ -229,6 +234,59 @@ void Request::configure_admin(VStateless methoded_array().configure_admin(*this); } +const char* Request::get_exception_cstr( + const Exception& e, + Request::Exception_details& details) { +#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]" + char* result=new(PointerFreeGC) char[MAX_STRING]; + + 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(); + snprintf(result, MAX_STRING, + 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 + snprintf(result, MAX_STRING, + PA_URI_FORMAT + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, + request_info.uri, + details.problem_source->cstr(), + e.comment(), e.type() + ); + } else + snprintf(result, MAX_STRING, + PA_URI_FORMAT + PA_COMMENT_TYPE_FORMAT, + request_info.uri, + e.comment(), e.type() + ); + + return result; +} + +void Request::configure() { + // configure admin options if not configured yet + if(!configure_admin_done) + configure_admin(main_class); + + // configure not-admin=user options + methoded_array().configure_user(*this); + + // $MAIN:MIME-TYPES + if(Value* element=main_class.get_element(mime_types_name, main_class, false)) + if(Table *table=element->get_table()) + mime_types=table; +} /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -241,7 +299,6 @@ void Request::configure_admin(VStateless */ void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) { - #ifdef RESOURCES_DEBUG //measures struct timeval mt[10]; @@ -249,6 +306,9 @@ struct timeval mt[10]; gettimeofday(&mt[0],NULL); #endif try { + // filling mail received + mail.fill_received(*this); + // loading config if(config_filespec) { const String& filespec=*new String(config_filespec); @@ -290,31 +350,20 @@ gettimeofday(&mt[0],NULL); } } - // compile requested file - String& spath_translated=*new String; - spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); - use_file(main_class, - spath_translated, - 0 /*main_alias*/, - true /*ignore class_path*/); - - // configure method_frame options if not configured yet - if(!configure_admin_done) - configure_admin(main_class); - - // configure not-method_frame=user options - methoded_array().configure_user(*this); - - // $MAIN:MIME-TYPES - if(Value* element=main_class.get_element(mime_types_name, main_class, false)) - if(Table *table=element->get_table()) - mime_types=table; - - // filling cookies - cookie.fill_fields(request_info); - - // filling mail received - mail.fill_received(*this); + try { + // compile requested file + String& spath_translated=*new String; + spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); + use_file(main_class, + spath_translated, + 0 /*main_alias*/, + true /*ignore class_path*/); + + configure(); + } catch(...) { + configure(); // configure anyway, useful in @unhandled_exception [say, if they would want to mail by SMTP something] + rethrow; + } #ifdef RESOURCES_DEBUG //measure:after compile @@ -323,7 +372,7 @@ gettimeofday(&mt[1],NULL); // execute @main[] const String* body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "'"MAIN_METHOD_NAME"' method not found"); @@ -339,6 +388,13 @@ 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)) @@ -383,41 +439,11 @@ t[9]-t[3] ); #endif } catch(const Exception& e) { // request handling problem + try { // we're returning not result, but error explanation -#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); - 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() - ); - } else - SAPI::log(sapi_info, - PA_URI_FORMAT - PA_COMMENT_TYPE_FORMAT, - request_info.uri, - e.comment(), e.type() - ); + Request::Exception_details details=get_details(e); + const char* exception_cstr=get_exception_cstr(e, details); // reset language to default flang=fdefault_lang; @@ -436,39 +462,41 @@ t[9]-t[3] 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*/); -frame.set_self(main_class); - -// $exception -frame.store_param(details.vhash); -// $stack[^table::set{name origin}] -Table::columns_type stack_trace_columns(new ArrayString); -*stack_trace_columns+=new String("name"); -*stack_trace_columns+=new String("file"); -*stack_trace_columns+=new String("lineno"); -*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(); iname, */ *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"); + *stack_trace_columns+=new String("file"); + *stack_trace_columns+=new String("lineno"); + *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(); icstr()); - 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); + body_string=new String(exception_cstr); } VString body_vstring(*body_string); VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); + // conditionally log it + Value* vhandled=details.vhash.hash().get(exception_handled_part_name); + if(!vhandled || !vhandled->as_bool()) { + SAPI::log(sapi_info, "%s", exception_cstr); + } + // ERROR. write it out output_result(body_file, header_only, false); + + } catch(const Exception& e) { // exception in unhandled exception + Request::Exception_details details=get_details(e); + const char* exception_cstr=get_exception_cstr(e, details); + // unconditionally log the beast + SAPI::log(sapi_info, "%s", exception_cstr); + + throw Exception(0, + 0, + "in %s", + exception_cstr); + } } } -size_t Request::register_file(String::Body file_spec) { +uint Request::register_file(String::Body file_spec) { file_list+=file_spec; return file_list.count()-1; } @@ -526,25 +561,25 @@ void Request::use_file(VStateless_class& file_spec=0; if(Value* element=main_class.get_element(class_path_name, main_class, false)) { if(element->is_string()) { - file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? + file_spec=file_exist(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { 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_exist(absolute(path), file_name))) break; // found along class_path } } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$" CLASS_PATH_NAME " must be string or table"); if(!file_spec) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); } if(!file_spec) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } @@ -560,28 +595,34 @@ void Request::use_file(VStateless_class& void Request::use_buf(VStateless_class& aclass, const char* source, const String* main_alias, - uint file_no) { + uint file_no, + int line_no_offset) { // temporary zero @conf so to maybe-replace it in compiled code Temp_method temp_method_conf(aclass, conf_method_name, 0); // temporary zero @auto so to maybe-replace it in compiled code Temp_method temp_method_auto(aclass, auto_method_name, 0); - // compile loaded class - VStateless_class& cclass=compile(&aclass, source, main_alias, file_no); + // compile loaded classes + ArrayClass& cclasses=compile(&aclass, source, main_alias, file_no, line_no_offset); - // locate and execute possible @conf[] static VString* vfilespec= new VString(*new String(file_list[file_no], String::L_TAINTED)); - Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, - conf_method_name, vfilespec, - false/*no string result needed*/); - if(executed.method) - configure_admin(cclass/*, executed.method->name*/); - - // locate and execute possible @auto[] static - execute_nonvirtual_method(cclass, - auto_method_name, vfilespec, - false/*no result needed*/); + + for(size_t i=0; iname*/); + + // locate and execute possible @auto[] static + execute_nonvirtual_method(cclass, + auto_method_name, vfilespec, + false/*no result needed*/); + } } const String& Request::relative(const char* apath, const String& relative_name) { @@ -611,27 +652,210 @@ const String& Request::absolute(const St return relative(request_info.path_translated, relative_name); } +#ifndef DOXYGEN +class Add_header_attribute_info +{ +public: + Add_header_attribute_info(Request& ar) : r(ar), add_last_modified(true) {} + Request& r; + bool add_last_modified; +}; +#endif static void add_header_attribute( - HashStringValue::key_type aattribute, - HashStringValue::value_type ameaning, - Request *r) { - if(aattribute==BODY_NAME - || aattribute==DOWNLOAD_NAME - || aattribute==CHARSET_NAME) + HashStringValue::key_type name, + HashStringValue::value_type value, + Add_header_attribute_info* info) { + if(name==BODY_NAME + || name==DOWNLOAD_NAME + || name==CHARSET_NAME) return; + + const char* aname=String(name, String::L_URI).cstr(String::L_UNSPECIFIED, 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)); - SAPI::add_header_attribute(r->sapi_info, - aattribute.cstr(), - attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false). - cstr(String::L_UNSPECIFIED)); + if(strcasecmp(aname, "last-modified")==0) + info->add_last_modified = false; } + +static void output_sole_piece(Request& r, + bool header_only, + VFile& body_file, + Value* body_file_content_type) { + // transcode text body when "text/*" or simple result + 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, + r.charsets.source(), + r.charsets.client()); + + // prepare header: content-length + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length); + SAPI::add_header_attribute(r.sapi_info, "content-length", content_length_cstr); + + // send header + SAPI::send_header(r.sapi_info); + + // send body + if(!header_only) + SAPI::send_body(r.sapi_info, output.str, output.length); +} + +#ifndef DOXYGEN +struct Range +{ + size_t start; + size_t end; +}; +#endif +static void parse_range(const String* s, Array &ar) +{ + const char *p = s->cstr(); + if(s->starts_with("bytes=")) + p += 6; + Range r; + while(*p){ + r.start = (size_t)-1; + r.end = (size_t)-1; + if(*p >= '0' && *p <= '9'){ + r.start = atol(p); + while(*p>='0' && *p<='9') ++p; + } + if(*p++ != '-') break; + if(*p >= '0' && *p <= '9'){ + r.end = atol(p); + while(*p>='0' && *p<='9') ++p; + } + if(*p == ',') ++p; + ar += r; + } +} + +static void output_pieces(Request& r, + bool header_only, + const String& filename, + size_t content_length, + Value& date, + bool add_last_modified) +{ + SAPI::add_header_attribute(r.sapi_info, "Accept-Ranges", "bytes"); + + const size_t BUFSIZE = 10*0x400; + char buf[BUFSIZE]; + const char *range = SAPI::get_env(r.sapi_info, "HTTP_RANGE"); + size_t offset=0; + size_t part_length=content_length; + if(range){ + Array ar; + parse_range(new String(range), ar); + size_t count = ar.count(); + if(count == 1){ + Range &rg = ar.get_ref(0); + if(rg.start == (size_t)-1 && rg.end == (size_t)-1){ + SAPI::add_header_attribute(r.sapi_info, "status", "416 Requested Range Not Satisfiable"); + return; + } + if(rg.start == (size_t)-1 && rg.end != (size_t)-1){ + rg.start = content_length - rg.end; + rg.end = content_length; + offset += rg.start; + part_length = rg.end-rg.start; + }else if(rg.start != (size_t)-1 && rg.end == (size_t)-1){ + rg.end = content_length-1; + offset += rg.start; + part_length -= rg.start; + } + if(part_length == 0){ + SAPI::add_header_attribute(r.sapi_info, "status", "204 No Content"); + return; + } + SAPI::add_header_attribute(r.sapi_info, "status", "206 Partial Content"); + snprintf(buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length); + SAPI::add_header_attribute(r.sapi_info, "Content-Range", buf); + }else if(count != 0){ + SAPI::add_header_attribute(r.sapi_info, "status", "501 Not Implemented"); + return; + } + } + + + snprintf(buf, BUFSIZE, "%u", part_length); + SAPI::add_header_attribute(r.sapi_info, "Content-Length", buf); + + if(add_last_modified){ + const String &s = attributed_meaning_to_string(date, String::L_AS_IS, true); + SAPI::add_header_attribute(r.sapi_info, "Last-Modified", s.cstr()); + } + SAPI::send_header(r.sapi_info); + + const String& filespec=r.absolute(filename); + + size_t sent = 0; + if(!header_only){ + size_t to_read = 0; + size_t size = 0; + do{ + to_read = part_lengthfields().get(content_type_name); + + // content-disposition + Value* vfile_name=body_file->fields().get(name_name); + if(!vfile_name) { + vfile_name=body_file->fields().get(response_body_file_name); + if(vfile_name) + { + const String& sfile_name=vfile_name->as_string(); + + char* name_cstr=sfile_name.cstrm(); + if(char *after_slash=rsplit(name_cstr, '\\')) + name_cstr=after_slash; + if(char *after_slash=rsplit(name_cstr, '/')) + name_cstr=after_slash; + vfile_name=new VString(*new String(name_cstr)); + } + } + if(vfile_name) { + const String& sfile_name=vfile_name->as_string(); + if(sfile_name!=NONAME_DAT) { + VHash& hash=*new VHash(); + HashStringValue &h=hash.hash(); + h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline )); + + h.put(content_disposition_filename_name, vfile_name); + response.fields().put(content_disposition_name, &hash); + + if(!body_file_content_type) + body_file_content_type=new VString(mime_type_of(sfile_name.cstr())); + } + } + // set content-type - if((body_file_content_type=body_file->fields().get(content_type_name))) { + if(body_file_content_type) { // body file content type response.fields().put(content_type_name, body_file_content_type); } else { @@ -640,41 +864,41 @@ void Request::output_result(VFile* body_ new VString(*new String(DEFAULT_CONTENT_TYPE))); } - // content-disposition - if(Value* vfile_name=body_file->fields().get(name_name)) - if(*vfile_name->get_string()!=NONAME_DAT) { - VHash& hash=*new VHash(); - HashStringValue &h=hash.hash(); - if(as_attachment) - h.put(value_name, new VString(content_disposition_value)); - h.put(content_disposition_filename_name, vfile_name); - response.fields().put(content_disposition_name, &hash); - } - // prepare header: $response:fields without :body - response.fields().for_each(add_header_attribute, this); + Add_header_attribute_info info(*this); + response.fields().for_each(add_header_attribute, &info); - // transcode text body when "text/*" or simple result if(body_file_content_type) if(HashStringValue *hash=body_file_content_type->get_hash()) body_file_content_type=hash->get(value_name); - 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", output.length); - SAPI::add_header_attribute(sapi_info, "content-length", content_length_cstr); + if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) { + const String& sresponse_body_file=vresponse_body_file->as_string(); + size_t content_length=0; + time_t atime=0, mtime=0, ctime=0; + file_stat(absolute(sresponse_body_file), + content_length, + atime, mtime, ctime); + + VDate* vdate=0; + if(Value* v=body_file->fields().get("mdate")) { + if(Value* vdatep=v->as(VDATE_TYPE, false)) + vdate=static_cast(vdatep); + else + throw Exception(PARSER_RUNTIME, 0, "mdate must be a date"); + } + if(!vdate) + vdate=new VDate(mtime); - // send header - SAPI::send_header(sapi_info); - - // send body - if(!header_only) - SAPI::send_body(sapi_info, output.str, output.length); + output_pieces(*this, header_only, + sresponse_body_file, + content_length, + *vdate, + info.add_last_modified); + } else { + output_sole_piece(*this, header_only, + *body_file, body_file_content_type); + } } const String& Request::mime_type_of(const char* user_file_name_cstr) { @@ -686,7 +910,7 @@ const String& Request::mime_type_of(cons if(const String* result=mime_types->item(1)) return *result; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, MIME_TYPES_NAME " table column elements must not be empty"); } @@ -695,19 +919,15 @@ const String& Request::mime_type_of(cons } #ifdef XML -GdomeDOMString_auto_ptr Request::transcode(const String& s) { +xmlChar* Request::transcode(const String& s) { return charsets.source().transcode(s); } -GdomeDOMString_auto_ptr Request::transcode(const String::Body s) { +xmlChar* Request::transcode(const String::Body s) { return charsets.source().transcode(s); } -const String& Request::transcode(GdomeDOMString* s) { - return charsets.source().transcode(s); -} - -const String& Request::transcode(xmlChar* s) { +const String& Request::transcode(const xmlChar* s) { return charsets.source().transcode(s); } #endif @@ -718,13 +938,15 @@ const Request::Trace Request::Exception_ if(!is_empty()) { result=bottom_value(); if(!problem_source) { // we don't know who trigged the bug? - problem_source=result.name(); // consider the stack-top-guy did that + problem_source=result.name(); // consider the stack-top-guy (we usually know source of next-from-throw-point exception) did that fbottom++; } else if(result.name()==problem_source) // it is that same guy? fbottom++; // throw away that trace - // else stack top contains not us, - // leaving result intact - // it would help ^throw + else { + // stack top contains not us, + // leaving result intact + // it would help ^throw + } } return result; @@ -763,7 +985,7 @@ Request::Exception_details Request::get_ new VString(*new String(comment, 0, true/*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); }