--- parser3/src/main/pa_request.C 2003/07/23 08:40:54 1.245.2.37.2.34 +++ parser3/src/main/pa_request.C 2004/07/26 14:43:09 1.267 @@ -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-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/07/23 08:40:54 $"; +static const char * const IDENT_REQUEST_C="$Date: 2004/07/26 14:43:09 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -31,6 +31,8 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vcookie.h" #include "pa_vresponse.h" #include "pa_vmemory.h" +#include "pa_vconsole.h" +#include "pa_vdate.h" // consts @@ -51,7 +53,7 @@ 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" +#define RESPONSE_BODY_FILE_NAME "file" // globals @@ -65,6 +67,7 @@ const String exception_type_part_name(EX const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME); const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME); const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME); +const String response_body_file_name(RESPONSE_BODY_FILE_NAME); // defines for statics @@ -94,7 +97,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 +116,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,12 +134,14 @@ 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(); + cache_managers->maybe_expire(); /// directly used // MAIN class, operators @@ -147,14 +152,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 +199,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 +274,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 +313,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 +335,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 +352,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 +387,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 +454,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()); - */ - } - 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) { +uint Request::register_file(String::Body file_spec) { file_list+=file_spec; return file_list.count()-1; } @@ -547,7 +534,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 @@ -576,14 +563,15 @@ 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); + VStateless_class& cclass=compile(&aclass, source, main_alias, file_no, line_no_offset); // locate and execute possible @conf[] static VString* vfilespec= @@ -627,70 +615,381 @@ 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) { + Add_header_attribute_info* info) { if(aattribute==BODY_NAME || aattribute==DOWNLOAD_NAME || aattribute==CHARSET_NAME) return; - SAPI::add_header_attribute(r->sapi_info, - aattribute.cstr(), + const char* a=aattribute.cstr(); + SAPI::add_header_attribute(info->r.sapi_info, + a, attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false). cstr(String::L_UNSPECIFIED)); + + if(strcasecmp(a, "last-modified")==0) + info->add_last_modified = false; } + +/* + if(v = opts->get("mdate")){ + ++valid_options; + if(Value* vdate=v->as(VDATE_TYPE, false)) + date=static_cast(vdate); + else throw Exception("parser.runtime", 0, "mdate must be a date"); + } + if(v = opts->get("disposition")){ + ++valid_options; + if(!v->is("string")) throw Exception("parser.runtime", 0, "disposition must be a string"); + disposition = v->get_string()->cstr(); + if(strcmp(disposition, "inline") && strcmp(disposition, "attachment")) throw Exception("parser.runtime", 0, "disposition can be only 'inline' or 'attachment'"); + } + if(valid_options != opts->count()) + throw Exception("parser.runtime", 0, "invalid option passed"); + } + + auto_file f = fopen(c_from_file_name, "rb"); + if(f == 0) + throw Exception("parser.runtime", 0, "Can't open file"); + + if(fseek(f, 0, SEEK_END)!=0) + throw Exception("parser.runtime", 0, "Can't seek file"); + + size_t file_length = (size_t)ftell(f); + if(file_length == (size_t)-1) + throw Exception("parser.runtime", 0, "can't get file size"); + if(file_length <= offset) + throw Exception("parser.runtime", 0, "offset too big"); + + size_t content_length = file_length-offset; + if(limit != (size_t)-1) + content_length = limit 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((char*)buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length); + SAPI::add_header_attribute(r.sapi_info, "Content-Range", (char*)buf); + }else if(count != 0){ + SAPI::add_header_attribute(r.sapi_info, "status", "501 Not Implemented"); + return; + } + } + + fseek(f, offset, SEEK_SET); + snprintf((char*)buf, BUFSIZE, "%u", part_length); + SAPI::add_header_attribute(r.sapi_info, "Content-Length", (char*)buf); + + if(info.add_content_disposition && disposition){ + const char *fname = 0; + if(to_file_name){ + fname = to_file_name->as_string().cstr(); + }else{ + const char *fname = c_from_file_name; + const char *p1 = strrchr(fname, '/'); + const char *p2 = strrchr(fname, '\\'); + if(p1 || p2) + fname = max(p1, p2)+1; + } + + snprintf((char*)buf, BUFSIZE, "%s; filename=\"%s\"", disposition, fname); + SAPI::add_header_attribute(r.sapi_info, "Content-Disposition", (char*)buf); + } + if(info.add_content_type) + SAPI::add_header_attribute(r.sapi_info, "Content-Type", r.mime_type_of(c_from_file_name).cstr()); + if(info.add_last_modified){ + if(date == 0){ + struct stat st; + if(stat(c_from_file_name, &st)!=0) throw Exception("parser.runtime", 0, "can't get file stat"); + date = new VDate(st.st_mtime); + } + const String &s = attributed_meaning_to_string(*date, String::L_AS_IS, true); + SAPI::add_header_attribute(r.sapi_info, "Last-Modified", s.cstr()); + } + r.cookie.output_result(r.sapi_info); + SAPI::send_header(r.sapi_info); + + const char* request_method=getenv("REQUEST_METHOD"); + bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; + size_t sent = 0; + if(!header_only){ + size_t to_read = 0; + size_t size = 0; + do{ + to_read = part_lengthas_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) +{ + 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)) { - // body file content type - response.fields().put(content_type_name, body_file_content_type); - } else { - // default content type - response.fields().put_dont_replace(content_type_name, - new VString(*new String(DEFAULT_CONTENT_TYPE))); - } + // may be specified + Value* body_file_content_type=body_file->fields().get(content_type_name); // content-disposition - if(Value* vfile_name=body_file->fields().get(name_name)) - if(*vfile_name->get_string()!=NONAME_DAT) { + Value* vfile_name=body_file->fields().get(name_name); + if(!vfile_name) { + vfile_name=body_file->fields().get(response_body_file_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(); 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); + + 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 content type + response.fields().put(content_type_name, body_file_content_type); + } else { + // default content type + response.fields().put_dont_replace(content_type_name, + new VString(*new String(DEFAULT_CONTENT_TYPE))); + } // 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) { @@ -715,7 +1014,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 +1066,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