parser3/src/main/pa_request.C - diff

Return to pa_request.C CVS log

Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/pa_request.C between versions 1.282 and 1.317

version 1.282, 2006/11/16 18:03:13	version 1.317, 2010/03/31 21:50:28
Line 1	Line 1
/** @file	/** @file
Parser: request class main part. @see compile.C and execute.C.	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 <paf@design.ru> (http://paf.design.ru)	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
*/	*/

Line 49 const char* ORIGINS_CONTENT_TYPE="text/p	Line 49 const char* ORIGINS_CONTENT_TYPE="text/p

#define MAIN_METHOD_NAME "main"	#define MAIN_METHOD_NAME "main"
#define AUTO_METHOD_NAME "auto"	#define AUTO_METHOD_NAME "auto"
	#define AUTOUSE_METHOD_NAME "autouse"
#define BODY_NAME "body"	#define BODY_NAME "body"
#define EXCEPTION_TYPE_PART_NAME "type"	#define EXCEPTION_TYPE_PART_NAME "type"
#define EXCEPTION_SOURCE_PART_NAME "source"	#define EXCEPTION_SOURCE_PART_NAME "source"
Line 58 const char* ORIGINS_CONTENT_TYPE="text/p	Line 59 const char* ORIGINS_CONTENT_TYPE="text/p

const String main_method_name(MAIN_METHOD_NAME);	const String main_method_name(MAIN_METHOD_NAME);
const String auto_method_name(AUTO_METHOD_NAME);	const String auto_method_name(AUTO_METHOD_NAME);
const String content_disposition_name(CONTENT_DISPOSITION_NAME);	const String autouse_method_name(AUTOUSE_METHOD_NAME);
const String content_disposition_inline(CONTENT_DISPOSITION_INLINE);
const String content_disposition_value(CONTENT_DISPOSITION_VALUE);
const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
const String body_name(BODY_NAME);	const String body_name(BODY_NAME);
const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME);	const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME);
const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME);	const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME);
Line 108 Request::Request(SAPI_Info& asapi_info,	Line 107 Request::Request(SAPI_Info& asapi_info,
wcontext(0),	wcontext(0),
flang(adefault_lang),	flang(adefault_lang),
fconnection(0),	fconnection(0),
finterrupted(false),fskip(SKIP_NOTHING),	finterrupted(false),
	fskip(SKIP_NOTHING),
	fin_cycle(0),

// public	// public
#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
Line 125 Request::Request(SAPI_Info& asapi_info,	Line 126 Request::Request(SAPI_Info& asapi_info,
form(*new VForm(charsets, arequest_info)),	form(*new VForm(charsets, arequest_info)),
mail(*new VMail),	mail(*new VMail),
response(*new VResponse(arequest_info, charsets)),	response(*new VResponse(arequest_info, charsets)),
cookie(*new VCookie),	cookie(*new VCookie(charsets, arequest_info)),
	console(*new VConsole),

// private	// private
configure_admin_done(false),	configure_admin_done(false),
Line 158 Request::Request(SAPI_Info& asapi_info,	Line 160 Request::Request(SAPI_Info& asapi_info,
if(status_allowed)	if(status_allowed)
classes().put(String::Body(STATUS_CLASS_NAME), new VStatus());	classes().put(String::Body(STATUS_CLASS_NAME), new VStatus());
// request class	// 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	// cookie class
classes().put(String::Body(COOKIE_CLASS_NAME), &cookie);	classes().put(String::Body(COOKIE_CLASS_NAME), &cookie);
// console class	// console class
classes().put(String::Body(CONSOLE_CLASS_NAME), new VConsole());	classes().put(String::Body(CONSOLE_CLASS_NAME), &console);

/// methoded	/// methoded
// response class	// response class
classes().put(response.get_class()->name(), &response);	classes().put(response.get_class()->name(), &response);
Line 197 Request::~Request() {	Line 198 Request::~Request() {

Value& Request::get_self() { return method_frame/always have!/->self(); }	Value& Request::get_self() { return method_frame/always have!/->self(); }

	Value* Request::get_class(const String& name){
	Value* result=classes().get(name);
	if(!result)
	if(Value* value=main_class.get_element(autouse_method_name))
	if(Junction* junction=value->get_junction())
	if(const Method *method=junction->method) {
	Value *vname=new VString(name);
	VMethodFrame frame(junction, 0/no parent*/);

	frame.set_self(main_class);
	frame.store_params(&vname, 1);
	// we don't need the result
	execute_method(frame, *method);

	result=classes().get(name);
	}

	return result;
	}

static void load_charset(HashStringValue::key_type akey,	static void load_charset(HashStringValue::key_type akey,
HashStringValue::value_type avalue,	HashStringValue::value_type avalue,
Request_charsets* charsets) {	Request_charsets* charsets) {
Line 205 static void load_charset(HashStringValue	Line 226 static void load_charset(HashStringValue
}	}
void Request::configure_admin(VStateless_class& conf_class) {	void Request::configure_admin(VStateless_class& conf_class) {
if(configure_admin_done)	if(configure_admin_done)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"parser already configured");	"parser already configured");
configure_admin_done=true;	configure_admin_done=true;
Line 218 void Request::configure_admin(VStateless	Line 239 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(!vcharsets->is_string())
if(HashStringValue* charsets=vcharsets->get_hash())	if(HashStringValue* charsets=vcharsets->get_hash())
charsets->for_each<Request_charsets*>(load_charset, &this->charsets);	charsets->for_each<Request_charsets*>(load_charset, &this->charsets);
else	else
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");	"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");
}	}
Line 282 void Request::configure() {	Line 303 void Request::configure() {
methoded_array().configure_user(*this);	methoded_array().configure_user(*this);

// $MAIN:MIME-TYPES	// $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())	if(Table *table=element->get_table())
mime_types=table;	mime_types=table;
}	}
Line 305 struct timeval mt[10];	Line 326 struct timeval mt[10];
gettimeofday(&mt[0],NULL);	gettimeofday(&mt[0],NULL);
#endif	#endif
try {	try {
// filling cookies
cookie.fill_fields(request_info);

// filling mail received	// filling mail received
mail.fill_received(*this);	mail.fill_received(*this);

Line 348 gettimeofday(&mt[0],NULL);	Line 366 gettimeofday(&mt[0],NULL);
true /fail on read problem/,	true /fail on read problem/,
false /but ignore absence, sole user/);	false /but ignore absence, sole user/);
}	}
after=before+1;	for(after=before+1;*after=='/';after++);
}	}
}	}

Line 374 gettimeofday(&mt[1],NULL);	Line 392 gettimeofday(&mt[1],NULL);
// execute @main[]	// execute @main[]
const String* body_string=execute_virtual_method(main_class, main_method_name);	const String* body_string=execute_virtual_method(main_class, main_method_name);
if(!body_string)	if(!body_string)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"'"MAIN_METHOD_NAME"' method not found");	"'"MAIN_METHOD_NAME"' method not found");

Line 390 gettimeofday(&mt[2],NULL);	Line 408 gettimeofday(&mt[2],NULL);
body_value=response.fields().get(body_name); // $response:body	body_value=response.fields().get(body_name); // $response:body
if(!body_value)	if(!body_value)
body_value=new VString(*body_string); // just result of ^main[]	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	// @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(Junction* junction=value->get_junction())
if(const Method *method=junction->method) {	if(const Method *method=junction->method) {
// preparing to pass parameters to	// preparing to pass parameters to
Line 407 gettimeofday(&mt[2],NULL);	Line 418 gettimeofday(&mt[2],NULL);
VMethodFrame frame(/method->name, / junction, 0/no parent*/);	VMethodFrame frame(/method->name, / junction, 0/no parent*/);
frame.set_self(main_class);	frame.set_self(main_class);

frame.store_param(*body_value);	frame.store_params(&body_value, 1);
body_value=&execute_method(frame, *method).as_value();	body_value=&execute_method(frame, *method).as_value();
}	}

VFile* body_file=body_value->as_vfile(	VFile* body_file=body_value->as_vfile(flang, &charsets);
String::L_UNSPECIFIED, &charsets);

#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
//measure:after postprocess	//measure:after postprocess
Line 458 t[9]-t[3]	Line 468 t[9]-t[3]

// maybe we'd be lucky enough as to report an error	// maybe we'd be lucky enough as to report an error
// in a gracefull way...	// in a gracefull way...
if(Value* value=main_class.get_element(	if(Value* value=main_class.get_element(*new String(UNHANDLED_EXCEPTION_METHOD_NAME))) {
*new String(UNHANDLED_EXCEPTION_METHOD_NAME),
main_class,
false)) {
if(Junction* junction=value->get_junction()) {	if(Junction* junction=value->get_junction()) {
if(const Method *method=junction->method) {	if(const Method *method=junction->method) {
// preparing to pass parameters to	// preparing to pass parameters to
// @unhandled_exception[exception;stack]	// @unhandled_exception[exception;stack]
VMethodFrame frame(/method->name, / junction, 0/no caller*/);	VMethodFrame frame(/method->name, / junction, 0/no caller*/);
frame.set_self(main_class);	frame.set_self(main_class);

// $exception	// $stack[^table::create{name file lineno colno}]
frame.store_param(details.vhash);	Table::columns_type stack_trace_columns(new ArrayString);
// $stack[^table::set{name origin}]	*stack_trace_columns+=new String("name");
Table::columns_type stack_trace_columns(new ArrayString);	*stack_trace_columns+=new String("file");
*stack_trace_columns+=new String("name");	*stack_trace_columns+=new String("lineno");
*stack_trace_columns+=new String("file");	*stack_trace_columns+=new String("colno");
*stack_trace_columns+=new String("lineno");	Table& stack_trace=*new Table(stack_trace_columns);
*stack_trace_columns+=new String("colno");	if(!exception_trace.is_empty()/signed!/)
Table& stack_trace=*new Table(stack_trace_columns);	for(size_t i=exception_trace.bottom_index(); i<exception_trace.top_index(); i++) {
if(!exception_trace.is_empty()/signed!/)	Trace trace=exception_trace.get(i);
for(size_t i=exception_trace.bottom_index(); i<exception_trace.top_index(); i++) {	Table::element_type row(new ArrayString);
Trace trace=exception_trace.get(i);
Table::element_type row(new ArrayString);	*row+=trace.name(); // name column
	Operation::Origin origin=trace.origin();
*row+=trace.name(); // name column	if(origin.file_no) {
Operation::Origin origin=trace.origin();	*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column
if(origin.file_no) {	*row+=new String(String::Body::Format(1+origin.line), String::L_CLEAN); // 'lineno' column
*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column	*row+=new String(String::Body::Format(1+origin.col), String::L_CLEAN); // 'colno' column
*row+=new String(String::Body::Format(1+origin.line), String::L_CLEAN); // 'lineno' column	}
*row+=new String(String::Body::Format(1+origin.col), String::L_CLEAN); // 'colno' column	stack_trace+=row;
}	}
stack_trace+=row;
}	Value *params[]={&details.vhash, new VTable(&stack_trace)};
frame.store_param(*new VTable(&stack_trace));	frame.store_params(params, 2);

// future $response:body=	// future $response:body=
// execute ^unhandled_exception[exception;stack]	// execute ^unhandled_exception[exception;stack]
exception_trace.clear(); // forget all about previous life, in case there would be error inside of this method, error handled would not be mislead by old stack contents (see extract_origin)	exception_trace.clear(); // forget all about previous life, in case there would be error inside of this method, error handled would not be mislead by old stack contents (see extract_origin)
body_string=&execute_method(frame, *method).as_string();	body_string=&execute_method(frame, *method).as_string();
}	}
}	}
}	}
Line 506 body_string=&execute_method(frame, *meth	Line 513 body_string=&execute_method(frame, *meth
// doing that ugly	// doing that ugly

// future $response:content-type	// future $response:content-type
response.fields().put(content_type_name,	response.fields().put(http_content_type, new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE)));
new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE)));
// future $response:body	// future $response:body
body_string=new String(exception_cstr);	body_string=new String(exception_cstr);
}	}

VString body_vstring(*body_string);	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	// conditionally log it
Value* vhandled=details.vhash.hash().get(exception_handled_part_name);	Value* vhandled=details.vhash.hash().get(exception_handled_part_name);
Line 523 body_string=&execute_method(frame, *meth	Line 529 body_string=&execute_method(frame, *meth

// ERROR. write it out	// ERROR. write it out
output_result(body_file, header_only, false);	output_result(body_file, header_only, false);

} catch(const Exception& e) { // exception in unhandled exception	} catch(const Exception& e) { // exception in unhandled exception
Request::Exception_details details=get_details(e);	Request::Exception_details details=get_details(e);
const char* exception_cstr=get_exception_cstr(e, details);	const char* exception_cstr=get_exception_cstr(e, details);
Line 559 void Request::use_file(VStateless_class&	Line 566 void Request::use_file(VStateless_class&
file_spec=&absolute(file_name);	file_spec=&absolute(file_name);
else {	else {
file_spec=0;	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()) {	if(element->is_string()) {
file_spec=file_exist(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()) {	} else if(Table *table=element->get_table()) {
Line 570 void Request::use_file(VStateless_class&	Line 577 void Request::use_file(VStateless_class&
break; // found along class_path	break; // found along class_path
}	}
} else	} else
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"$" CLASS_PATH_NAME " must be string or table");	"$" CLASS_PATH_NAME " must be string or table");
if(!file_spec)	if(!file_spec)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
&file_name,	&file_name,
"not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME);	"not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME);
}	}
if(!file_spec)	if(!file_spec)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
&file_name,	&file_name,
"usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified");	"usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified");
}	}
Line 602 void Request::use_buf(VStateless_class&	Line 609 void Request::use_buf(VStateless_class&
// temporary zero @auto so to maybe-replace it in compiled code	// temporary zero @auto so to maybe-replace it in compiled code
Temp_method temp_method_auto(aclass, auto_method_name, 0);	Temp_method temp_method_auto(aclass, auto_method_name, 0);

// compile loaded class	// compile loaded classes
VStateless_class& cclass=compile(&aclass, source, main_alias, file_no, line_no_offset);	ArrayClass& cclasses=compile(&aclass, source, main_alias, file_no, line_no_offset);

// locate and execute possible @conf[] static
VString* vfilespec=	VString* vfilespec=
new VString(*new String(file_list[file_no], String::L_TAINTED));	new VString(*new String(file_list[file_no], String::L_TAINTED));
Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass,
conf_method_name, vfilespec,	for(size_t i=0; i<cclasses.count(); i++){
false/no string result needed/);	VStateless_class& cclass=*cclasses.get(i);
if(executed.method)
configure_admin(cclass/, executed.method->name/);	// locate and execute possible @conf[] static
	Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass,
// locate and execute possible @auto[] static	conf_method_name, vfilespec,
execute_nonvirtual_method(cclass,	false/no string result needed/);
auto_method_name, vfilespec,	if(executed.method)
false/no result needed/);	configure_admin(cclass/, executed.method->name/);

	// 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) {	const String& Request::relative(const char* apath, const String& relative_name) {
Line 657 public:	Line 669 public:
};	};
#endif	#endif
static void add_header_attribute(	static void add_header_attribute(
HashStringValue::key_type aattribute,	HashStringValue::key_type name,
HashStringValue::value_type ameaning,	HashStringValue::value_type value,
Add_header_attribute_info* info) {	Add_header_attribute_info* info) {
if(aattribute==BODY_NAME	if(name==BODY_NAME
\|\| aattribute==DOWNLOAD_NAME	\|\| name==DOWNLOAD_NAME
\|\| aattribute==CHARSET_NAME)	\|\| name==CHARSET_NAME)
return;	return;

	const char* aname=String(name, String::L_URI).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets);

const char* a=aattribute.cstr();
SAPI::add_header_attribute(info->r.sapi_info,	SAPI::add_header_attribute(info->r.sapi_info,
a,	aname,
attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false).	attributed_meaning_to_string(*value, String::L_URI, false).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets)
cstr(String::L_UNSPECIFIED));	);

if(strcasecmp(a, "last-modified")==0)	if(strcasecmp(aname, "last-modified")==0)
info->add_last_modified = false;	info->add_last_modified=false;
}	}

static void output_sole_piece(Request& r,	static void output_sole_piece(Request& r,
Line 686 static void output_sole_piece(Request& r	Line 699 static void output_sole_piece(Request& r
r.charsets.source(),	r.charsets.source(),
r.charsets.client());	r.charsets.client());

// prepare header: content-length	// prepare header: Content-Length
char content_length_cstr[MAX_NUMBER];	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u"));
snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length);
SAPI::add_header_attribute(r.sapi_info, "content-length", content_length_cstr);

// send header	// send header
SAPI::send_header(r.sapi_info);	SAPI::send_header(r.sapi_info);
Line 706 struct Range	Line 717 struct Range
size_t end;	size_t end;
};	};
#endif	#endif
static void parse_range(const String* s, Array<Range> &ar)	static void parse_range(const String* s, Array<Range> &ar) {
{
const char *p = s->cstr();	const char *p = s->cstr();
if(s->starts_with("bytes="))	if(s->starts_with("bytes="))
p += 6;	p += 6;
Line 736 static void output_pieces(Request& r,	Line 746 static void output_pieces(Request& r,
Value& date,	Value& date,
bool add_last_modified)	bool add_last_modified)
{	{
SAPI::add_header_attribute(r.sapi_info, "Accept-Ranges", "bytes");	SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes");

const size_t BUFSIZE = 10*0x400;	const size_t BUFSIZE = 10*0x400;
char buf[BUFSIZE];	char buf[BUFSIZE];
Line 750 static void output_pieces(Request& r,	Line 760 static void output_pieces(Request& r,
if(count == 1){	if(count == 1){
Range &rg = ar.get_ref(0);	Range &rg = ar.get_ref(0);
if(rg.start == (size_t)-1 && rg.end == (size_t)-1){	if(rg.start == (size_t)-1 && rg.end == (size_t)-1){
SAPI::add_header_attribute(r.sapi_info, "status", "416 Requested Range Not Satisfiable");	SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "416 Requested Range Not Satisfiable");
return;	return;
}	}
if(rg.start == (size_t)-1 && rg.end != (size_t)-1){	if(rg.start == (size_t)-1 && rg.end != (size_t)-1){
Line 764 static void output_pieces(Request& r,	Line 774 static void output_pieces(Request& r,
part_length -= rg.start;	part_length -= rg.start;
}	}
if(part_length == 0){	if(part_length == 0){
SAPI::add_header_attribute(r.sapi_info, "status", "204 No Content");	SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "204 No Content");
return;	return;
}	}
SAPI::add_header_attribute(r.sapi_info, "status", "206 Partial Content");	SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "206 Partial Content");
snprintf(buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length);	snprintf(buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length);
SAPI::add_header_attribute(r.sapi_info, "Content-Range", buf);	SAPI::add_header_attribute(r.sapi_info, "content-range", buf);
}else if(count != 0){	}else if(count != 0){
SAPI::add_header_attribute(r.sapi_info, "status", "501 Not Implemented");	SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "501 Not Implemented");
return;	return;
}	}
}	}


snprintf(buf, BUFSIZE, "%u", part_length);	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(part_length, "%u"));
SAPI::add_header_attribute(r.sapi_info, "Content-Length", buf);
	if(add_last_modified)
	SAPI::add_header_attribute(r.sapi_info, "last-modified", attributed_meaning_to_string(date, String::L_AS_IS, true).cstr());

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);	SAPI::send_header(r.sapi_info);

const String& filespec=r.absolute(filename);	const String& filespec=r.absolute(filename);
Line 815 void Request::output_result(VFile* body_	Line 823 void Request::output_result(VFile* body_
// header: cookies	// header: cookies
cookie.output_result(sapi_info);	cookie.output_result(sapi_info);

// may be specified	// _file_ content-type might be specified
Value* body_file_content_type=body_file->fields().get(content_type_name);	Value* body_file_content_type=body_file->fields().get(content_type_name);

// content-disposition	// Content-Disposition
Value* vfile_name=body_file->fields().get(name_name);	Value* vfile_name=body_file->fields().get(name_name);
if(!vfile_name) {	if(!vfile_name) {
vfile_name=body_file->fields().get(response_body_file_name);	vfile_name=body_file->fields().get(response_body_file_name);
if(vfile_name)	if(vfile_name) {
{	char* name_cstr=vfile_name->as_string().cstrm();
const String& sfile_name=vfile_name->as_string();

char* name_cstr=sfile_name.cstrm();
if(char *after_slash=rsplit(name_cstr, '\\'))	if(char *after_slash=rsplit(name_cstr, '\\'))
name_cstr=after_slash;	name_cstr=after_slash;
if(char *after_slash=rsplit(name_cstr, '/'))	if(char *after_slash=rsplit(name_cstr, '/'))
Line 837 void Request::output_result(VFile* body_	Line 842 void Request::output_result(VFile* body_
if(vfile_name) {	if(vfile_name) {
const String& sfile_name=vfile_name->as_string();	const String& sfile_name=vfile_name->as_string();
if(sfile_name!=NONAME_DAT) {	if(sfile_name!=NONAME_DAT) {
if(as_attachment)	VHash& hash=*new VHash();
{	HashStringValue &h=hash.hash();
VHash& hash=*new VHash();	h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline ));
HashStringValue &h=hash.hash();	h.put(content_disposition_filename_name, vfile_name);
h.put(value_name, new VString(content_disposition_value));
h.put(content_disposition_filename_name, vfile_name);	response.fields().put(content_disposition, &hash);
response.fields().put(content_disposition_name, &hash);
}

if(!body_file_content_type)	if(!body_file_content_type)
body_file_content_type=new VString(mime_type_of(sfile_name.cstr()));	body_file_content_type=new VString(mime_type_of(sfile_name.cstr()));
}	}
}	}

// set content-type	// set Content-Type
if(body_file_content_type) {	if(body_file_content_type) {
// body file content type	// body file content type
response.fields().put(content_type_name, body_file_content_type);	response.fields().put(content_type_name, body_file_content_type);
} else {	} else {
// default content type	// default content type
response.fields().put_dont_replace(content_type_name,	response.fields().put_dont_replace(content_type_name, new VString(*new String(DEFAULT_CONTENT_TYPE)));
new VString(*new String(DEFAULT_CONTENT_TYPE)));
}	}

// prepare header: $response:fields without :body	// prepare header: $response:fields without :body, :download and :charset
Add_header_attribute_info info(*this);	Add_header_attribute_info info(*this);
response.fields().for_each<Add_header_attribute_info*>(add_header_attribute, &info);	response.fields().for_each<Add_header_attribute_info*>(add_header_attribute, &info);

if(body_file_content_type)
if(HashStringValue *hash=body_file_content_type->get_hash())
body_file_content_type=hash->get(value_name);

if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) {	if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) {
	// $response:[download\|body][$.file[filespec]] -- optput specified file
const String& sresponse_body_file=vresponse_body_file->as_string();	const String& sresponse_body_file=vresponse_body_file->as_string();
size_t content_length=0;	size_t content_length=0;
time_t atime=0, mtime=0, ctime=0;	time_t atime=0, mtime=0, ctime=0;
Line 879 void Request::output_result(VFile* body_	Line 878 void Request::output_result(VFile* body_

VDate* vdate=0;	VDate* vdate=0;
if(Value* v=body_file->fields().get("mdate")) {	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<VDate*>(vdatep);	vdate=static_cast<VDate*>(vdatep);
else	else
throw Exception("parser.runtime", 0, "mdate must be a date");	throw Exception(PARSER_RUNTIME, 0, "mdate must be a date");
}	}
if(!vdate)	if(!vdate)
vdate=new VDate(mtime);	vdate=new VDate(mtime);
Line 893 void Request::output_result(VFile* body_	Line 892 void Request::output_result(VFile* body_
*vdate,	*vdate,
info.add_last_modified);	info.add_last_modified);
} else {	} else {
	if(body_file_content_type)
	if(HashStringValue *hash=body_file_content_type->get_hash())
	body_file_content_type=hash->get(value_name);

output_sole_piece(*this, header_only,	output_sole_piece(*this, header_only,
*body_file, body_file_content_type);	*body_file, body_file_content_type);
}	}
Line 904 const String& Request::mime_type_of(cons	Line 907 const String& Request::mime_type_of(cons
String sext(++cext);	String sext(++cext);
Table::Action_options options;	Table::Action_options options;
if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER), options))	if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER), options))
if(const String* result=mime_types->item(1))	if(const String* result=mime_types->item(1))
return *result;	return *result;
else	else
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
MIME_TYPES_NAME " table column elements must not be empty");	MIME_TYPES_NAME " table column elements must not be empty");
}	}
Line 961 Request::Exception_details Request::get_	Line 964 Request::Exception_details Request::get_

// $.source	// $.source
if(problem_source) {	if(problem_source) {
String& source=*new String;	String& source=new String(problem_source, String::L_TAINTED);
source.append(problem_source, String::L_TAINTED, true/forced*/);

hash.put(exception_source_part_name, new VString(source));	hash.put(exception_source_part_name, new VString(source));
}	}

Line 979 Request::Exception_details Request::get_	Line 980 Request::Exception_details Request::get_
// $.comment	// $.comment
if(const char* comment=e.comment(true))	if(const char* comment=e.comment(true))
hash.put(exception_comment_part_name,	hash.put(exception_comment_part_name,
new VString(new String(comment, 0, true/tainted*/)));	new VString(*new String(comment, String::L_TAINTED)));

// $.handled(0)	// $.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);	return Request::Exception_details(trace, problem_source, vhash);
}	}

E-mail:

Removed from v.1.282
changed lines
	Added in v.1.317