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.353 and 1.377

version 1.353, 2016/04/03 23:07:44	version 1.377, 2018/03/22 16:04:05
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-2015 Art. Lebedev Studio (http://www.artlebedev.com)	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
*/	*/

#include "pa_sapi.h"	#include "pa_sapi.h"
#include "pa_common.h"	#include "pa_common.h"
	#include "pa_os.h"
#include "pa_request.h"	#include "pa_request.h"
#include "pa_wwrapper.h"	#include "pa_wwrapper.h"
#include "pa_vclass.h"	#include "pa_vclass.h"
Line 44 const char* UNHANDLED_EXCEPTION_CONTENT_	Line 45 const char* UNHANDLED_EXCEPTION_CONTENT_
/// content type of response when no $MAIN:defaults.content-type defined	/// content type of response when no $MAIN:defaults.content-type defined
const char* DEFAULT_CONTENT_TYPE="text/html";	const char* DEFAULT_CONTENT_TYPE="text/html";

	const uint LOOP_LIMIT=20000;
	const uint EXECUTE_RECOURSION_LIMIT=1000;
	const size_t FILE_SIZE_LIMIT=51210241024;

// defines for globals	// defines for globals

#define MAIN_METHOD_NAME "main"	#define MAIN_METHOD_NAME "main"
#define AUTO_METHOD_NAME "auto"	#define AUTO_METHOD_NAME "auto"
	#define USE_METHOD_NAME "use"
#define AUTOUSE_METHOD_NAME "autouse"	#define AUTOUSE_METHOD_NAME "autouse"

#define EXCEPTION_TYPE_PART_NAME "type"	#define EXCEPTION_TYPE_PART_NAME "type"
#define EXCEPTION_SOURCE_PART_NAME "source"	#define EXCEPTION_SOURCE_PART_NAME "source"
#define EXCEPTION_COMMENT_PART_NAME "comment"	#define EXCEPTION_COMMENT_PART_NAME "comment"

	#define ORIGIN_KEY "origin"

// globals	// globals

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 autouse_method_name(AUTOUSE_METHOD_NAME);	static const String use_method_name(USE_METHOD_NAME);
	static const String autouse_method_name(AUTOUSE_METHOD_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);
const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME);	const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME);
const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME);	const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME);

	static const String origin_key(ORIGIN_KEY);

	int pa_loop_limit=LOOP_LIMIT;
	int pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT;
	size_t pa_file_size_limit=FILE_SIZE_LIMIT;

// defines for statics	// defines for statics

#define CHARSETS_NAME "CHARSETS"	#define CHARSETS_NAME "CHARSETS"
#define MIME_TYPES_NAME "MIME-TYPES"	#define MIME_TYPES_NAME "MIME-TYPES"
#define STRICT_VARS_NAME "STRICT-VARS"	#define STRICT_VARS_NAME "STRICT-VARS"
	#define PROTOTYPE_NAME "OBJECT-PROTOTYPE"
	#define LIMITS_NAME "LIMITS"
	#define LOOP_LIMIT_NAME "max_loop"
	#define RECOURSION_LIMIT_NAME "max_recoursion"
	#define FILE_SIZE_LIMIT_NAME "max_file_size"
	#define LOCK_WAIT_TIMEOUT_NAME "lock_wait_timeout"
#define CONF_METHOD_NAME "conf"	#define CONF_METHOD_NAME "conf"
#define POST_PROCESS_METHOD_NAME "postprocess"	#define POST_PROCESS_METHOD_NAME "postprocess"
#define CLASS_PATH_NAME "CLASS_PATH"	#define CLASS_PATH_NAME "CLASS_PATH"
Line 83 static const String charsets_name(CHARSE	Line 105 static const String charsets_name(CHARSE
static const String main_class_name(MAIN_CLASS_NAME);	static const String main_class_name(MAIN_CLASS_NAME);
static const String mime_types_name(MIME_TYPES_NAME);	static const String mime_types_name(MIME_TYPES_NAME);
static const String strict_vars_name(STRICT_VARS_NAME);	static const String strict_vars_name(STRICT_VARS_NAME);
	static const String prototype_name(PROTOTYPE_NAME);
	static const String limits_name(LIMITS_NAME);
	static const String loop_limit_name(LOOP_LIMIT_NAME);
	static const String recoursion_limit_name(RECOURSION_LIMIT_NAME);
	static const String file_size_limit_name(FILE_SIZE_LIMIT_NAME);
	static const String lock_wait_timeout_name(LOCK_WAIT_TIMEOUT_NAME);

static const String conf_method_name(CONF_METHOD_NAME);	static const String conf_method_name(CONF_METHOD_NAME);
static const String post_process_method_name(POST_PROCESS_METHOD_NAME);	static const String post_process_method_name(POST_PROCESS_METHOD_NAME);
static const String class_path_name(CLASS_PATH_NAME);	static const String class_path_name(CLASS_PATH_NAME);
Line 119 Request::Request(SAPI_Info& asapi_info,	Line 148 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),
fin_cycle(0),	fin_cycle(0),
	fskip(SKIP_NOTHING),

// public	// public
request_info(arequest_info),	request_info(arequest_info),
sapi_info(asapi_info),	sapi_info(asapi_info),
charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets	charsets(pa_UTF8_charset, pa_UTF8_charset, pa_UTF8_charset), // default charsets

main_class(VClassMAIN_create()),	main_class(VClassMAIN_create()),
form(*new VForm(charsets, arequest_info)),	form(*new VForm(charsets, arequest_info)),
Line 160 Request::Request(SAPI_Info& asapi_info,	Line 188 Request::Request(SAPI_Info& asapi_info,
methoded_array().register_directly_used(*this);	methoded_array().register_directly_used(*this);

/// methodless	/// methodless

// env class	// env class
put_class(new VEnv(asapi_info));	put_class(new VEnv(asapi_info));
// status class	// status class
Line 170 Request::Request(SAPI_Info& asapi_info,	Line 199 Request::Request(SAPI_Info& asapi_info,
put_class(&cookie);	put_class(&cookie);
// console class	// console class
put_class(&console);	put_class(&console);

/// methoded	/// methoded

// response class	// response class
put_class(&response);	put_class(&response);

// form class	// form class
put_class(&form);	put_class(&form);
// mail class	// mail class
Line 196 Request::~Request() {	Line 226 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){	VStateless_class* Request::get_class(const String& name){
Value* result=classes().get(name);	VStateless_class* result=classes().get(name);
if(!result)	if(!result)
if(Value* value=main_class.get_element(autouse_method_name))	if(const Method *method=main_class.get_element_method(autouse_method_name)){
if(Junction* junction=value->get_junction())	Value *vname=new VString(name);
if(const Method *method=junction->method) {	CONSTRUCTOR_FRAME_ACTION(method, 0 /no parent*/, main_class, {
Value *vname=new VString(name);	frame.store_params(&vname, 1);
VMethodFrame frame(method, 0 /no parent*/, main_class);	// we don't need the result
	call(frame);
frame.store_params(&vname, 1);	});
// we don't need the result	result=classes().get(name);
execute_method(frame);	}

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

return result;	return result;
}	}

static void load_charset(HashStringValue::key_type akey,	static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, Request_charsets* charsets) {
HashStringValue::value_type avalue,	pa_charsets.load_charset(*charsets, akey, avalue->as_string());
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) {	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, "parser already configured");
0,
"parser already configured");
configure_admin_done=true;	configure_admin_done=true;

// charsets must only be specified in method_frame config	// charsets must only be specified in method_frame config
Line 241 void Request::configure_admin(VStateless	Line 263 void Request::configure_admin(VStateless
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, "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");
0,
"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");
}	}
}	}

Line 252 void Request::configure_admin(VStateless	Line 272 void Request::configure_admin(VStateless
if(Value* strict_vars=conf_class.get_element(strict_vars_name)) {	if(Value* strict_vars=conf_class.get_element(strict_vars_name)) {
if(strict_vars->is_bool())	if(strict_vars->is_bool())
VVoid::strict_vars=strict_vars->as_bool();	VVoid::strict_vars=strict_vars->as_bool();
else	else
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" STRICT_VARS_NAME " must be bool");
0,
"$" MAIN_CLASS_NAME ":" STRICT_VARS_NAME " must be bool");
}	}
#endif	#endif

	#ifdef OBJECT_PROTOTYPE
	VClass::prototype=true;
	if(Value* prototype=conf_class.get_element(prototype_name)) {
	if(prototype->is_bool())
	VClass::prototype=prototype->as_bool();
	else
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" PROTOTYPE_NAME " must be bool");
	}
	#endif

	Value* limits=conf_class.get_element(limits_name);

	pa_loop_limit=LOOP_LIMIT;
	if(limits)
	if(Value* loop_limit=limits->get_element(loop_limit_name)) {
	if(loop_limit->is_evaluated_expr()) {
	pa_loop_limit=loop_limit->as_int();
	if(pa_loop_limit==0) pa_loop_limit=INT_MAX;
	} else
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOOP_LIMIT_NAME " must be int");
	}

	pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT;
	if(limits)
	if(Value* recoursion_limit=limits->get_element(recoursion_limit_name)) {
	if(recoursion_limit->is_evaluated_expr()) {
	pa_execute_recoursion_limit=recoursion_limit->as_int();
	if(pa_execute_recoursion_limit==0) pa_execute_recoursion_limit=INT_MAX;
	} else
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." RECOURSION_LIMIT_NAME " must be int");
	}

	pa_file_size_limit=FILE_SIZE_LIMIT;
	if(limits)
	if(Value* file_size_limit=limits->get_element(file_size_limit_name)) {
	if(file_size_limit->is_evaluated_expr()) {
	double limit=file_size_limit->as_double();
	if(limit >= (double)SSIZE_MAX)
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be less then %.15g", (double)SSIZE_MAX);
	pa_file_size_limit=(size_t)limit;
	if(pa_file_size_limit==0) pa_file_size_limit=SSIZE_MAX;
	} else
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be number");
	}

	pa_lock_attempts=PA_LOCK_ATTEMPTS;
	if(limits)
	if(Value* lock_wait_timeout=limits->get_element(lock_wait_timeout_name)) {
	if(lock_wait_timeout->is_evaluated_expr()) {
	double limit=lock_wait_timeout->as_double();
	if(limit >= 3600*24)
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be less then %d", 3600*24);
	pa_lock_attempts=(unsigned int)(limit*2)+1;
	} else
	throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be number");
	}

// configure method_frame options	// configure method_frame options
// until someone with less privileges have overriden them	// until someone with less privileges have overriden them
methoded_array().configure_admin(*this);	methoded_array().configure_admin(*this);
Line 331 void Request::core(const char* config_fi	Line 406 void Request::core(const char* config_fi
// loading config	// loading config
if(config_filespec) {	if(config_filespec) {
const String& filespec=*new String(config_filespec);	const String& filespec=*new String(config_filespec);
use_file_directly(main_class,	use_file_directly(main_class, filespec, config_fail_on_read_problem, true /file must exist if 'fail on read problem' not set/);
filespec,
config_fail_on_read_problem,
true /file must exist if 'fail on read problem' not set/);
}	}

// filling mail received	// filling mail received
Line 355 void Request::core(const char* config_fi	Line 427 void Request::core(const char* config_fi
while(const char* before=strchr(after, '/')) {	while(const char* before=strchr(after, '/')) {
String& sfile_spec=*new String;	String& sfile_spec=*new String;
if(after!=request_info.path_translated) {	if(after!=request_info.path_translated) {
sfile_spec.append_strdup(	sfile_spec.append_strdup(request_info.path_translated, before-request_info.path_translated, String::L_CLEAN);
request_info.path_translated, before-request_info.path_translated,
String::L_CLEAN);
sfile_spec << "/" AUTO_FILE_NAME;	sfile_spec << "/" AUTO_FILE_NAME;

use_file_directly(main_class,	use_file_directly(main_class, sfile_spec, true /fail on read problem/, false /but ignore absence, sole user/);
sfile_spec,
true /fail on read problem/,
false /but ignore absence, sole user/);
}	}
for(after=before+1;*after=='/';after++);	for(after=before+1;*after=='/';after++);
}	}
Line 384 void Request::core(const char* config_fi	Line 451 void Request::core(const char* config_fi
// 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, "'" MAIN_METHOD_NAME "' method not found");
0,
"'" MAIN_METHOD_NAME "' method not found");

// extract response body	// extract response body
Value* body_value=response.fields().get(download_name_upper); // $response:download?	Value* body_value=response.fields().get(download_name_upper); // $response:download?
Line 402 void Request::core(const char* config_fi	Line 467 void Request::core(const char* config_fi
if(const Method *method=junction->method) {	if(const Method *method=junction->method) {
// preparing to pass parameters to	// preparing to pass parameters to
// @postprocess[data]	// @postprocess[data]
VMethodFrame frame(method, 0 /no parent*/, main_class);	METHOD_FRAME_ACTION(method, 0 /no parent*/, main_class, {
	frame.store_params(&body_value, 1);
frame.store_params(&body_value, 1);	call(frame);
execute_method(frame);	body_value=&frame.result();
	});
body_value=&frame.result().as_value();
}	}

VFile* body_file=body_value->as_vfile(flang, &charsets);	VFile* body_file=body_value->as_vfile(flang, &charsets);
Line 465 void Request::core(const char* config_fi	Line 529 void Request::core(const char* config_fi
// 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)

VMethodFrame frame(method, 0 /no caller*/, main_class);
Value *params[]={&details.vhash, new VTable(&stack_trace)};	Value *params[]={&details.vhash, new VTable(&stack_trace)};
	METHOD_FRAME_ACTION(method, 0 /no caller*/, main_class, {
frame.store_params(params, 2);	frame.store_params(params, 2);
execute_method(frame);	call(frame);
	body_string=&frame.result().as_string();
body_string=&frame.result().as_string();	});
}	}
}	}
}	}
Line 503 void Request::core(const char* config_fi	Line 566 void Request::core(const char* config_fi
// unconditionally log the beast	// unconditionally log the beast
SAPI::log(sapi_info, "%s", exception_cstr);	SAPI::log(sapi_info, "%s", exception_cstr);

throw Exception(0,	throw Exception(0, 0, "in %s", exception_cstr);
0,
"in %s",
exception_cstr);
}	}
}	}
}	}
Line 516 uint Request::register_file(String::Body	Line 576 uint Request::register_file(String::Body
return file_list.count()-1;	return file_list.count()-1;
}	}

void Request::use_file_directly(VStateless_class& aclass,	void Request::use_file_directly(VStateless_class& aclass, const String& file_spec, bool fail_on_read_problem, bool fail_on_file_absence) {
const String& file_spec,
bool fail_on_read_problem,
bool fail_on_file_absence) {

// cyclic dependence check	// cyclic dependence check
if(used_files.get(file_spec))	if(used_files.get(file_spec))
return;	return;
Line 536 void Request::use_file_directly(VStatele	Line 592 void Request::use_file_directly(VStatele


void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/absolute/) {	void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/absolute/) {

if(file_name.is_empty())	if(file_name.is_empty())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME, 0, "usage failed - no filename was specified");
0,
"usage failed - no filename was specified");

const String* filespec=0;	const String* filespec=0;

Line 567 void Request::use_file(VStateless_class&	Line 620 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, "$" CLASS_PATH_NAME " must be string or table");
0,
"$" CLASS_PATH_NAME " must be string or table");
if(!filespec)	if(!filespec)
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME, &file_name, "not found along $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME);
&file_name,
"not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME);
} else	} else
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified");
&file_name,
"usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified");
}	}

use_file_directly(aclass, *filespec);	use_file_directly(aclass, *filespec);
}	}

void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/absolute/, Operation::Origin origin) {	void Request::use_file(const String& file_name, const String* use_filespec/absolute/, Operation::Origin origin) {
static String use("USE");	static String use("USE");
try {	try {
use_file(aclass, file_name, use_filespec);	static VHash* voptions=new VHash();
	if(const Method *method=main_class.get_method(use_method_name)){
	Value *params[]={new VString(file_name), voptions};
	voptions->hash().put(origin_key, new VString(*use_filespec));

	CONSTRUCTOR_FRAME_ACTION(method, 0 /no parent*/, main_class, {
	frame.store_params(params, 2);
	// we don't need the result
	call(frame);
	});
	}
} catch (...) {	} catch (...) {
exception_trace.push(Trace(&use, origin));	exception_trace.push(Trace(&use, origin));
rethrow;	rethrow;
}	}
}	}

void Request::use_buf(VStateless_class& aclass,	void Request::use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset) {
const char* source, const String* main_alias,	// temporary zero @conf to avoid it second execution
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);	Temp_method temp_method_conf(aclass, conf_method_name, 0);
// temporary zero @auto so to maybe-replace it in compiled code	// temporary zero @auto to avoid it second execution
Temp_method temp_method_auto(aclass, auto_method_name, 0);	Temp_method temp_method_auto(aclass, auto_method_name, 0);

// compile loaded classes	// compile loaded classes
Line 612 void Request::use_buf(VStateless_class&	Line 666 void Request::use_buf(VStateless_class&
VStateless_class& cclass=*cclasses.get(i);	VStateless_class& cclass=*cclasses.get(i);

// locate and execute possible @conf[] static	// locate and execute possible @conf[] static
Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass,	Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, conf_method_name, vfilespec, false/no string result needed/);
conf_method_name, vfilespec,
false/no string result needed/);
if(executed.method)	if(executed.method)
configure_admin(cclass/, executed.method->name/);	configure_admin(cclass/, executed.method->name/);

// locate and execute possible @auto[] static	// locate and execute possible @auto[] static
execute_nonvirtual_method(cclass,	execute_nonvirtual_method(cclass, auto_method_name, vfilespec, false/no result needed/);
auto_method_name, vfilespec,
false/no result needed/);

cclass.enable_default_setter();	cclass.enable_default_setter();
}	}
Line 678 static void add_header_attribute(HashStr	Line 728 static void add_header_attribute(HashStr
);	);
}	}

static void output_sole_piece(Request& r,	static void output_sole_piece(Request& r, bool header_only, VFile& body_file, Value* body_file_content_type) {
bool header_only,
VFile& body_file,
Value* body_file_content_type) {
// transcode text body when "text/*" or simple result	// transcode text body when "text/*" or simple result
String::C output(body_file.value_ptr(), 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)	if(!body_file_content_type/vstring.as_vfile/ \|\| body_file_content_type->as_string().pos("text/")==0)
output=Charset::transcode(output,	output=Charset::transcode(output, r.charsets.source(), r.charsets.client());
r.charsets.source(),
r.charsets.client());

// prepare header: Content-Length	// prepare header: Content-Length
SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u"));	SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u"));
Line 729 static void parse_range(const String* s,	Line 774 static void parse_range(const String* s,
}	}
}	}

static void output_pieces(Request& r,	static void output_pieces(Request& r, bool header_only, const String& filename, size_t content_length, Value& date, bool add_last_modified) {
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");	SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes");

const size_t BUFSIZE = 10*0x400;	const size_t BUFSIZE = 128*0x400;
char buf[BUFSIZE];	char buf[BUFSIZE];
const char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE");	const char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE");
size_t offset=0;	size_t offset=0;
Line 860 void Request::output_result(VFile* body_	Line 899 void Request::output_result(VFile* body_
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	// $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;	uint64_t content_length=0;
time_t atime=0, mtime=0, ctime=0;	time_t atime=0, mtime=0, ctime=0;
file_stat(absolute(sresponse_body_file),	file_stat(absolute(sresponse_body_file), content_length, atime, mtime, ctime);
content_length,
atime, mtime, ctime);

VDate* vdate=0;	VDate* vdate=0;
if(Value* v=body_file->fields().get("mdate")) {	if(Value* v=body_file->fields().get("mdate")) {
Line 876 void Request::output_result(VFile* body_	Line 913 void Request::output_result(VFile* body_
if(!vdate)	if(!vdate)
vdate=new VDate((pa_time_t)mtime);	vdate=new VDate((pa_time_t)mtime);

output_pieces(*this, header_only,	output_pieces(this, header_only, sresponse_body_file, (size_t)content_length, vdate, info.add_last_modified);
sresponse_body_file,
content_length,
*vdate,
info.add_last_modified);
} else {	} else {
if(body_file_content_type)	if(body_file_content_type)
if(HashStringValue *hash=body_file_content_type->get_hash())	if(HashStringValue *hash=body_file_content_type->get_hash())
body_file_content_type=hash->get(value_name);	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 936 const String& Request::mime_type_of(cons
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, MIME_TYPES_NAME " table column elements must not be empty");
0,
MIME_TYPES_NAME " table column elements must not be empty");
}	}
}	}

return *new String("application/octet-stream");	return *new String("application/octet-stream");
}	}

const String* Request::get_used_filename(uint file_no){	const String* Request::get_used_filespec(uint file_no){
if(file_no < file_list.count())	if(file_no < file_list.count())
return new String(file_list[file_no], String::L_TAINTED);	return new String(file_list[file_no], String::L_TAINTED);
return 0;	return 0;

E-mail:

Removed from v.1.353
changed lines
	Added in v.1.377