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.269 and 1.343

version 1.269, 2004/07/30 10:55:22	version 1.343, 2015/05/27 13:34:11
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-2004 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-2012 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)
*/	*/

static const char * const IDENT_REQUEST_C="$Date$";

#include "pa_sapi.h"	#include "pa_sapi.h"
#include "pa_common.h"	#include "pa_common.h"
#include "pa_request.h"	#include "pa_request.h"
Line 34 static const char * const IDENT_REQUEST_	Line 32 static const char * const IDENT_REQUEST_
#include "pa_vconsole.h"	#include "pa_vconsole.h"
#include "pa_vdate.h"	#include "pa_vdate.h"

	volatile const char * IDENT_PA_REQUEST_C="$Id$" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H;

// consts	// consts

#define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception"	#define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception"
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"
#define EXCEPTION_COMMENT_PART_NAME "comment"	#define EXCEPTION_COMMENT_PART_NAME "comment"
#define RESPONSE_BODY_FILE_NAME "file"

// 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 content_disposition_name(CONTENT_DISPOSITION_NAME);	const String autouse_method_name(AUTOUSE_METHOD_NAME);
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);
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);
const String response_body_file_name(RESPONSE_BODY_FILE_NAME);

// 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 ORIGINS_MODE_NAME "ORIGINS"	#define ORIGINS_MODE_NAME "ORIGINS"
#define CONF_METHOD_NAME "conf"	#define CONF_METHOD_NAME "conf"
#define POST_PROCESS_METHOD_NAME "postprocess"	#define POST_PROCESS_METHOD_NAME "postprocess"
#define DOWNLOAD_NAME "download"	#define DOWNLOAD_NAME "download"
#define CLASS_PATH_NAME "CLASS_PATH"	#define CLASS_PATH_NAME "CLASS_PATH"
	#define RESPONSE_BODY_FILE_NAME "file"

// statics	// statics

static const String charsets_name(CHARSETS_NAME);	static const String charsets_name(CHARSETS_NAME);
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 origins_mode_name(ORIGINS_MODE_NAME);	static const String origins_mode_name(ORIGINS_MODE_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 download_name(DOWNLOAD_NAME);	static const String download_name(DOWNLOAD_NAME);
static const String class_path_name(CLASS_PATH_NAME);	static const String class_path_name(CLASS_PATH_NAME);
	static const String response_body_file_name(RESPONSE_BODY_FILE_NAME);

// defines	// defines

Line 97 VStateless_class& VClassMAIN_create();	Line 99 VStateless_class& VClassMAIN_create();

//	//
Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info,	Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info,
String::Language adefault_lang, bool status_allowed):	String::Language adefault_lang):
// private	// private
anti_endless_execute_recoursion(0),	anti_endless_execute_recoursion(0),

// public	// public
	allow_class_replace(false),
method_frame(0),	method_frame(0),
rcontext(0),	rcontext(0),
wcontext(0),	wcontext(0),
flang(adefault_lang),	flang(adefault_lang),
fconnection(0),	fconnection(0),
finterrupted(false),	finterrupted(false),
	fskip(SKIP_NOTHING),
// public	fin_cycle(0),
#ifdef RESOURCES_DEBUG
sql_connect_time(0),
sql_request_time(0),
#endif

// public	// public
request_info(arequest_info),	request_info(arequest_info),
Line 124 Request::Request(SAPI_Info& asapi_info,	Line 123 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 154 Request::Request(SAPI_Info& asapi_info,	Line 154 Request::Request(SAPI_Info& asapi_info,
// env class	// env class
classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info));	classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info));
// status class	// status class
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, asapi_info));
// 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 189 Request::~Request() {	Line 187 Request::~Request() {
// if for some strange reason xml generic errors failed to be reported, free them up	// if for some strange reason xml generic errors failed to be reported, free them up
if(const char* xml_generic_errors=xmlGenericErrors()) {	if(const char* xml_generic_errors=xmlGenericErrors()) {
SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors);	SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors);
free((void *)xml_generic_errors);	pa_free((void *)xml_generic_errors);
}	}
#endif	#endif
}	}

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(method, 0 /no parent*/, main_class);

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

	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 204 static void load_charset(HashStringValue	Line 221 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 217 void Request::configure_admin(VStateless	Line 234 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(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");
	}
}	}

	#ifdef STRICT_VARS
	VVoid::strict_vars=false;
	if(Value* strict_vars=conf_class.get_element(strict_vars_name)) {
	if(strict_vars->is_bool())
	VVoid::strict_vars=strict_vars->as_bool();
	else
	throw Exception(PARSER_RUNTIME,
	0,
	"$" MAIN_CLASS_NAME ":" STRICT_VARS_NAME " must be bool");
	}
	#endif

// 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 271 const char* Request::get_exception_cstr(	Line 301 const char* Request::get_exception_cstr(

return result;	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))
	if(Table *table=element->get_table())
	mime_types=table;
	}
/**	/**
load MAIN class, execute @main.	load MAIN class, execute @main.
MAIN class consists of all the auto.p files we'd manage to find	MAIN class consists of all the auto.p files we'd manage to find
Line 283 const char* Request::get_exception_cstr(	Line 327 const char* Request::get_exception_cstr(

*/	*/
void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) {	void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) {
#ifdef RESOURCES_DEBUG
//measures
struct timeval mt[10];
//measure:before all
gettimeofday(&mt[0],NULL);
#endif
try {	try {
// 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(main_class,	use_file_directly(main_class,
filespec, 0 /main_alias/,	filespec,
true /ignore class_path/,
config_fail_on_read_problem,	config_fail_on_read_problem,
true /file must exist if 'fail on read problem' not set/);	true /file must exist if 'fail on read problem' not set/);
}	}

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

// loading auto.p files from document_root/..	// loading auto.p files from document_root/..
// to the one beside requested file.	// to the one beside requested file.
// all assigned bases from upper dir	// all assigned bases from upper dir
Line 320 gettimeofday(&mt[0],NULL);	Line 360 gettimeofday(&mt[0],NULL);
String::L_CLEAN);	String::L_CLEAN);
sfile_spec << "/" AUTO_FILE_NAME;	sfile_spec << "/" AUTO_FILE_NAME;

use_file(main_class,	use_file_directly(main_class,
sfile_spec,	sfile_spec,
0 /main_alias/,
true /ignore class_path/,
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++);
}	}
}	}

// compile requested file	try {
String& spath_translated=*new String;	// compile requested file
spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED);	String& spath_translated=*new String;
use_file(main_class,	spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED);
spath_translated,	use_file_directly(main_class, spath_translated);
0 /main_alias/,
true /ignore class_path/);	configure();
	} catch(...) {
// configure method_frame options if not configured yet	configure(); // configure anyway, useful in @unhandled_exception [say, if they would want to mail by SMTP something]
if(!configure_admin_done)	rethrow;
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);

#ifdef RESOURCES_DEBUG
//measure:after compile
gettimeofday(&mt[1],NULL);
#endif
// 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");

#ifdef RESOURCES_DEBUG
//measure:after main
gettimeofday(&mt[2],NULL);
#endif

// extract response body	// extract response body
Value* body_value=response.fields().get(download_name); // $response:download?	Value* body_value=response.fields().get(download_name); // $response:download?
Line 382 gettimeofday(&mt[2],NULL);	Line 397 gettimeofday(&mt[2],NULL);
body_value=new VString(*body_string); // just result of ^main[]	body_value=new VString(*body_string); // just result of ^main[]

// @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
// @postprocess[data]	// @postprocess[data]
VMethodFrame frame(/method->name, / junction, 0/no parent*/);	VMethodFrame frame(method, 0 /no parent*/, 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();	execute_method(frame);
}

VFile* body_file=body_value->as_vfile(	body_value=&frame.result().as_value();
String::L_UNSPECIFIED, &charsets);	}

#ifdef RESOURCES_DEBUG	VFile* body_file=body_value->as_vfile(flang, &charsets);
//measure:after postprocess
gettimeofday(&mt[3],NULL);
#endif

// OK. write out the result	// OK. write out the result
output_result(body_file, header_only, as_attachment);	output_result(body_file, header_only, as_attachment);

#ifdef RESOURCES_DEBUG
//measure:after output_result
gettimeofday(&mt[9],NULL);
t[9]=mt[9].tv_sec+mt[9].tv_usec/1000000.0;

double t[10];
for(int i=0;i<10;i++)
t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
//measure:log2 compile,main,postprocess,output
SAPI::log("rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f",
request_info.uri,
t[1]-t[0],
t[2]-t[1],
t[3]-t[2],
sql_connect_time,sql_request_time,
t[9]-t[3]
);
#endif
} catch(const Exception& e) { // request handling problem	} catch(const Exception& e) { // request handling problem
try {	try {
// we're returning not result, but error explanation	// we're returning not result, but error explanation

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);
// log the beast
SAPI::log(sapi_info, "%s", exception_cstr);

// reset language to default	// reset language to default
flang=fdefault_lang;	flang=fdefault_lang;
Line 443 t[9]-t[3]	Line 433 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*/);
frame.set_self(main_class);	// $stack[^table::create{name file lineno colno}]
	Table::columns_type stack_trace_columns(new ArrayString);
// $exception	*stack_trace_columns+=new String("name");
frame.store_param(details.vhash);	*stack_trace_columns+=new String("file");
// $stack[^table::set{name origin}]	*stack_trace_columns+=new String("lineno");
Table::columns_type stack_trace_columns(new ArrayString);	*stack_trace_columns+=new String("colno");
*stack_trace_columns+=new String("name");	Table& stack_trace=*new Table(stack_trace_columns);
*stack_trace_columns+=new String("file");	if(!exception_trace.is_empty()/signed!/)
*stack_trace_columns+=new String("lineno");	for(size_t i=exception_trace.bottom_index(); i<exception_trace.top_index(); i++) {
*stack_trace_columns+=new String("colno");	Trace trace=exception_trace.get(i);
Table& stack_trace=*new Table(stack_trace_columns);	Table::element_type row(new ArrayString);
if(!exception_trace.is_empty()/signed!/)
for(size_t i=exception_trace.bottom_index(); i<exception_trace.top_index(); i++) {	*row+=trace.name(); // name column
Trace trace=exception_trace.get(i);	Operation::Origin origin=trace.origin();
Table::element_type row(new ArrayString);	if(origin.file_no) {
	*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column
*row+=trace.name(); // name column	*row+=new String(String::Body::Format(1+origin.line), String::L_CLEAN); // 'lineno' column
Operation::Origin origin=trace.origin();	*row+=new String(String::Body::Format(1+origin.col), String::L_CLEAN); // 'colno' column
if(origin.file_no) {	}
*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column	stack_trace+=row;
*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
}	// future $response:body=
stack_trace+=row;	// 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)
frame.store_param(*new VTable(&stack_trace));
	VMethodFrame frame(method, 0 /no caller*/, main_class);
	Value *params[]={&details.vhash, new VTable(&stack_trace)};

// future $response:body=	frame.store_params(params, 2);
// execute ^unhandled_exception[exception;stack]	execute_method(frame);
body_string=&execute_method(frame, *method).as_string();
	body_string=&frame.result().as_string();
}	}
}	}
}	}
Line 490 body_string=&execute_method(frame, *meth	Line 480 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
	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	// ERROR. write it out
output_result(body_file, header_only, false);	output_result(body_file, header_only, false);
} catch(const Exception& e) {
	} 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);
	// unconditionally log the beast
	SAPI::log(sapi_info, "%s", exception_cstr);

throw Exception(0,	throw Exception(0,
0,	0,
Line 518 uint Request::register_file(String::Body	Line 516 uint Request::register_file(String::Body
return file_list.count()-1;	return file_list.count()-1;
}	}

void Request::use_file(VStateless_class& aclass,	void Request::use_file_directly(VStateless_class& aclass,
const String& file_name, const String* main_alias,	const String& file_spec,
bool ignore_class_path,	bool fail_on_read_problem,
bool fail_on_read_problem,	bool fail_on_file_absence) {
bool fail_on_file_absence) {
// cyclic dependence check	// cyclic dependence check
if(used_files.get(file_name))	if(used_files.get(file_spec))
return;	return;
used_files.put(file_name, true);	used_files.put(file_spec, true);

	if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for
	if(!entry_exists(file_spec))
	return;

	if(const char* source=file_read_text(charsets, file_spec, fail_on_read_problem))
	use_buf(aclass, source, 0, register_file(file_spec));
	}

const String* file_spec;
if(ignore_class_path) // ignore_class_path?	void Request::use_file(VStateless_class& aclass,
file_spec=&file_name;	const String& file_name,
else if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH]	const String* use_filespec/absolute/) {
file_spec=&absolute(file_name);
else {	if(file_name.is_empty())
file_spec=0;	throw Exception(PARSER_RUNTIME,
if(Value* element=main_class.get_element(class_path_name, main_class, false)) {	0,
	"usage failed - no filename was specified");

	const String* filespec=0;

	if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH]
	filespec=&absolute(file_name);
	else if(use_filespec){ // search in current dir first
	size_t last_slash_pos=use_filespec->strrpbrk("/");
	if(last_slash_pos!=STRING_NOT_FOUND)
	filespec=file_exist(use_filespec->mid(0, last_slash_pos), file_name); // found in current dir?
	}

	if(!filespec){
	// prevent multiple scan CLASS_PATH for searching one file
	if(searched_along_class_path.get(file_name))
	return;
	searched_along_class_path.put(file_name, true);
	if(Value* element=main_class.get_element(class_path_name)) {
if(element->is_string()) {	if(element->is_string()) {
file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path?	filespec=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()) {
int size=table->count();	for(size_t i=table->count(); i--; ) {
for(int i=size; i--; ) {
const String& path=(table->get(i))[0];	const String& path=(table->get(i))[0];
if((file_spec=file_readable(absolute(path), file_name)))	if(filespec=file_exist(absolute(path), file_name))
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(!filespec)
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);
}	} else
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");
}	}

if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for	use_file_directly(aclass, *filespec);
if(!entry_exists(*file_spec))
return;

if(const char* source=file_read_text(charsets, *file_spec, fail_on_read_problem))
use_buf(aclass, source, main_alias, register_file(*file_spec));
}	}


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

	cclass.enable_default_setter();
	}
}	}

const String& Request::relative(const char* apath, const String& relative_name) {	const String& Request::relative(const char* apath, const String& relative_name) {
char *hpath=strdup(apath);	char *hpath=pa_strdup(apath);
String& result=*new String;	String& result=*new String;
if(rsplit(hpath, '/')) // if something/splitted	if(rsplit(hpath, '/')) // if something/splitted
result << hpath << "/";	result << hpath << "/";
Line 607 const String& Request::relative(const ch	Line 631 const String& Request::relative(const ch

const String& Request::absolute(const String& relative_name) {	const String& Request::absolute(const String& relative_name) {
if(relative_name.first_char()=='/') {	if(relative_name.first_char()=='/') {
String& result=*new String(strdup(request_info.document_root));	String& result=*new String(pa_strdup(request_info.document_root));
result << relative_name;	result << relative_name;
return result;	return result;
} else	} else
Line 633 public:	Line 657 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* 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*>(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;	const char* aname=String(name, String::L_URI).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets);
if(limit != (size_t)-1)
content_length = limit<content_length?limit:content_length;

size_t part_length = content_length;

const size_t BUFSIZE = 4096;
unsigned char buf[BUFSIZE];
const char *range = SAPI::get_env(r.sapi_info, "HTTP_RANGE");
if(range){
Array<Range> 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);	SAPI::add_header_attribute(info->r.sapi_info,
snprintf((char*)buf, BUFSIZE, "%u", part_length);	aname,
SAPI::add_header_attribute(r.sapi_info, "Content-Length", (char*)buf);	attributed_meaning_to_string(*value, String::L_URI, false).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets)
	);
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");	if(strcasecmp(aname, "last-modified")==0)
bool header_only=request_method && strcasecmp(request_method, "HEAD")==0;	info->add_last_modified=false;
size_t sent = 0;
if(!header_only){
size_t to_read = 0;
size_t size = 0;
do{
to_read = part_length<BUFSIZE?part_length:BUFSIZE;
to_read = fread(buf, 1, to_read, f);
if(to_read == 0)
break;
size = SAPI::send_body(r.sapi_info, buf, to_read);
sent += size;
if(size != to_read)
break;
part_length -= to_read;
}while(part_length);
}
// set flag to bypass other outputs
r.response.fields().put("ignore", new VString(*new String("y")));
r.write_no_lang(*new VInt(sent));
}	}


*/



static void output_sole_piece(Request& r,	static void output_sole_piece(Request& r,
bool header_only,	bool header_only,
VFile& body_file,	VFile& body_file,
Line 795 static void output_sole_piece(Request& r	Line 687 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 815 struct Range	Line 705 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 845 static void output_pieces(Request& r,	Line 734 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");

const size_t BUFSIZE = 10*0x400;	const size_t BUFSIZE = 10*0x400;
char buf[BUFSIZE];	char buf[BUFSIZE];
const char *range = SAPI::get_env(r.sapi_info, "HTTP_RANGE");	const char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE");
size_t offset=0;	size_t offset=0;
size_t part_length=content_length;	size_t part_length=content_length;
if(range){	if(range){
Line 857 static void output_pieces(Request& r,	Line 748 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 871 static void output_pieces(Request& r,	Line 762 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 922 void Request::output_result(VFile* body_	Line 811 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);
const String& sfile_name=vfile_name->as_string();	if(vfile_name) {
	char* name_cstr=vfile_name->as_string().cstrm();
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, '/'))	name_cstr=after_slash;
name_cstr=after_slash;	vfile_name=new VString(*new String(name_cstr));
vfile_name=new VString(*new String(name_cstr));	}
}	}
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) {
VHash& hash=*new VHash();	VHash& hash=*new VHash();
HashStringValue &h=hash.hash();	HashStringValue &h=hash.hash();
if(as_attachment)	h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline ));
h.put(value_name, new VString(content_disposition_value));	h.put(content_disposition_filename_name, new VString(*new String(sfile_name, String::L_HTTP_HEADER)));
h.put(content_disposition_filename_name, vfile_name);
response.fields().put(content_disposition_name, &hash);	response.fields().put(content_disposition, &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);	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 981 void Request::output_result(VFile* body_	Line 866 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 995 void Request::output_result(VFile* body_	Line 880 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);
}	}
}	}

	const String& Request::mime_type_of(const String* file_name) {
	return mime_type_of(file_name?file_name->taint_cstr(String::L_FILE_SPEC):0);
	}

const String& Request::mime_type_of(const char* user_file_name_cstr) {	const String& Request::mime_type_of(const char* user_file_name_cstr) {
if(mime_types)	if(mime_types)
if(const char* cext=strrchr(user_file_name_cstr, '.')) {	if(const char* cext=strrchr(user_file_name_cstr, '.')) {
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");
	}
}	}

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

#ifdef XML	const String* Request::get_used_filename(uint file_no){
GdomeDOMString_auto_ptr Request::transcode(const String& s) {	if(file_no < file_list.count())
return charsets.source().transcode(s);	return new String(file_list[file_no], String::L_TAINTED);
	return 0;
}	}

GdomeDOMString_auto_ptr Request::transcode(const String::Body s) {	#ifdef XML
	xmlChar* Request::transcode(const String& s) {
return charsets.source().transcode(s);	return charsets.source().transcode(s);
}	}

const String& Request::transcode(GdomeDOMString* s) {	xmlChar* Request::transcode(const String::Body s) {
return charsets.source().transcode(s);	return charsets.source().transcode(s);
}	}

const String& Request::transcode(xmlChar* s) {	const String& Request::transcode(const xmlChar* s) {
return charsets.source().transcode(s);	return charsets.source().transcode(s);
}	}
#endif	#endif
Line 1041 const Request::Trace Request::Exception_	Line 937 const Request::Trace Request::Exception_
if(!is_empty()) {	if(!is_empty()) {
result=bottom_value();	result=bottom_value();
if(!problem_source) { // we don't know who trigged the bug?	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++;	fbottom++;
} else if(result.name()==problem_source) // it is that same guy?	} else if(result.name()==problem_source) // it is that same guy?
fbottom++; // throw away that trace	fbottom++; // throw away that trace
// else stack top contains not us,	else {
// leaving result intact	// stack top contains not us,
// it would help ^throw	// leaving result intact
	// it would help ^throw
	}
}	}

return result;	return result;
Line 1065 Request::Exception_details Request::get_	Line 963 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 1083 Request::Exception_details Request::get_	Line 979 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);
}	}

	Temp_value_element::Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat) :
	frequest(arequest),
	fwhere(awhere),
	fname(aname),
	saved(awhere.get_element(aname))
	{
	Junction* junction;
	if(saved && (junction=saved->get_junction()) && junction->is_getter)
	saved=0;
	frequest.put_element(fwhere, aname, awhat);
	}

	Temp_value_element::~Temp_value_element() {
	frequest.put_element(fwhere, fname, saved ? saved : VVoid::get());
	}

E-mail:

Removed from v.1.269
changed lines
	Added in v.1.343