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.245.2.7 and 1.245.2.37.2.1

version 1.245.2.7, 2003/01/31 16:05:59	version 1.245.2.37.2.1, 2003/03/18 15:14:19
Line 16 static const char* IDENT_REQUEST_C="$Dat	Line 16 static const char* IDENT_REQUEST_C="$Dat
#include "pa_vint.h"	#include "pa_vint.h"
#include "pa_vmethod_frame.h"	#include "pa_vmethod_frame.h"
#include "pa_types.h"	#include "pa_types.h"
	#include "pa_venv.h"
	#include "pa_vmath.h"
	#include "pa_vstatus.h"
	#include "pa_vrequest.h"
#include "pa_vtable.h"	#include "pa_vtable.h"
#include "pa_vfile.h"	#include "pa_vfile.h"
#include "pa_dictionary.h"	#include "pa_dictionary.h"
#include "pa_charset.h"	#include "pa_charset.h"
#include "pa_charsets.h"	#include "pa_charsets.h"
#include "pa_cache_managers.h"	#include "pa_cache_managers.h"
	#include "pa_vmail.h"
	#include "pa_vform.h"
	#include "pa_vcookie.h"
	#include "pa_vresponse.h"

// consts	// consts

Line 37 const char* ORIGINS_CONTENT_TYPE="text/p	Line 45 const char* ORIGINS_CONTENT_TYPE="text/p
// defines for globals	// defines for globals

#define MAIN_METHOD_NAME "main"	#define MAIN_METHOD_NAME "main"
	#define AUTO_METHOD_NAME "auto"
	#define BODY_NAME "body"

// globals	// globals

StringPtr main_method_name(new String(MAIN_METHOD_NAME));	const String& main_method_name(new String(MAIN_METHOD_NAME));
	const String& auto_method_name(new String(AUTO_METHOD_NAME));
	const String& content_disposition_name(new String(CONTENT_DISPOSITION_NAME));
	const String& content_disposition_value(new String(CONTENT_DISPOSITION_VALUE));
	const String& content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME));
	const String& body_name(new String(BODY_NAME));

// defines for statics	// defines for statics

#define CHARSETS_NAME "CHARSETS"	#define CHARSETS_NAME "CHARSETS"
#define MAIN_CLASS_NAME "MAIN"
#define MIME_TYPES_NAME "MIME-TYPES"	#define MIME_TYPES_NAME "MIME-TYPES"
#define ORIGINS_MODE_NAME "ORIGINS"	#define ORIGINS_MODE_NAME "ORIGINS"
#define AUTO_FILE_NAME "auto.p"
#define CONF_METHOD_NAME "conf"	#define CONF_METHOD_NAME "conf"
#define AUTO_METHOD_NAME "auto"
#define POST_PROCESS_METHOD_NAME "postprocess"	#define POST_PROCESS_METHOD_NAME "postprocess"
#define BODY_NAME "body"
#define DOWNLOAD_NAME "download"	#define DOWNLOAD_NAME "download"
#define CLASS_PATH_NAME "CLASS_PATH"	#define CLASS_PATH_NAME "CLASS_PATH"

// statics	// statics

static StringPtr charsets_name(new String(CHARSETS_NAME));	static const String& charsets_name(new String(CHARSETS_NAME));
static StringPtr main_class_name(new String(MAIN_CLASS_NAME));	static const String& main_class_name(new String(MAIN_CLASS_NAME));
static StringPtr mime_types_name(new String(MIME_TYPES_NAME));	static const String& mime_types_name(new String(MIME_TYPES_NAME));
static StringPtr origins_mode_name(new String(ORIGINS_MODE_NAME));	static const String& origins_mode_name(new String(ORIGINS_MODE_NAME));
static StringPtr conf_method_name(new String(CONF_METHOD_NAME));	static const String& conf_method_name(new String(CONF_METHOD_NAME));
static StringPtr auto_method_name(new String(AUTO_METHOD_NAME));	static const String& post_process_method_name(new String(POST_PROCESS_METHOD_NAME));
static StringPtr post_process_method_name(new String(POST_PROCESS_METHOD_NAME));	static const String& download_name(new String(DOWNLOAD_NAME));
static StringPtr body_name(new String(BODY_NAME));	static const String& class_path_name(new String(CLASS_PATH_NAME));
static StringPtr download_name(new String(DOWNLOAD_NAME));
static StringPtr class_path_name(new String(CLASS_PATH_NAME));

// defines	// defines

// op.C	// op.C
VStateless_classPtr VClassMAIN_create();	VStateless_classPtr VClassMAIN_create();
// op.C	// op.C
VHashPtr exception2vhash(const Exception& e);	VHashPtr exception2vhashconst Exception& e);

void lock_system_class(HashStringValue::key_type key, HashStringValue::value_type value, int) {
if(VStateless_class *value_class=value->get_class())
value_class->lock();
}

//	//
Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info,	Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info,
uchar adefault_lang, bool status_allowed):	String_UL adefault_lang, bool status_allowed):
	// private
	fpool(),
	anti_endless_execute_recoursion(0),

	// public
	method_frame(0),
	rcontext(0),
	wcontext(0),
	flang(adefault_lang),
	fconnection(0),
	finterrupted(false),

	// public
	#ifdef RESOURCES_DEBUG
	sql_connect_time(0),
	sql_request_time(0),
	#endif

	// public
sapi_info(asapi_info),	sapi_info(asapi_info),
request_info(arequest_info),	request_info(arequest_info),
fdefault_lang(adefault_lang), flang(adefault_lang),

main_class(VClassMAIN_create()),
charsets(pool(), UTF8_charset, UTF8_charset, *UTF8_charset), // default charsets	charsets(pool(), UTF8_charset, UTF8_charset, *UTF8_charset), // default charsets

response(new VResponse(arequest_info, charsets)),	main_class(VClassMAIN_create()),
form(new VForm),	form(new VForm),
mail(new VMail),	mail(new VMail),
cookie(new VCookie)	response(new VResponse(fpool, arequest_info, charsets)),
	cookie(new VCookie),

	// private
	configure_admin_done(false),

	// private defaults
	fdefault_lang(adefault_lang),
	// private mime types
	mime_types(0)
{	{
// maybe expire old caches	// maybe expire old caches
cache_managers.maybe_expire();	cache_managers.maybe_expire();
Line 104 Request::Request(SAPI_Info& asapi_info,	Line 133 Request::Request(SAPI_Info& asapi_info,
classes().put(main_class->name(), main_class);	classes().put(main_class->name(), main_class);
// classes:	// classes:
// table, file, random, mail, image, ...	// table, file, random, mail, image, ...
methoded_array.register_directly_used(*this);	methoded_array().register_directly_used(*this);

/// methodless	/// methodless
// env class	// env class
classes().put(StringPtr(new String(ENV_CLASS_NAME)),	classes().put(String* (new String(ENV_CLASS_NAME)),
ValuePtr(new VEnv(asapi_info)));	ValuePtr(new VEnv(pool(), asapi_info)));
// status class	// status class
if(status_allowed)	if(status_allowed)
classes().put(StringPtr(new String(STATUS_CLASS_NAME)),	classes().put(String* (new String(STATUS_CLASS_NAME)),
ValuePtr(new VStatus));	ValuePtr(new VStatus()));
// request class	// request class
classes().put(StringPtr(new String(REQUEST_CLASS_NAME)),	classes().put(String* (new String(REQUEST_CLASS_NAME)),
ValuePtr(new VRequest(arequest_info, charsets)));	ValuePtr(new VRequest(arequest_info, charsets)));
// cookie class	// cookie class
classes().put(StringPtr(new String(COOKIE_CLASS_NAME)), cookie);	classes().put(String* (new String(COOKIE_CLASS_NAME)), cookie);

/// methoded	/// methoded
// response class	// response class
Line 131 Request::Request(SAPI_Info& asapi_info,	Line 160 Request::Request(SAPI_Info& asapi_info,
classes().put(mail->get_class()->base_class()->name(), mail);	classes().put(mail->get_class()->base_class()->name(), mail);
// math class	// math class
{	{
ValuePtr math(new VMail);	ValuePtr math(new VMath);
classes().put(math->get_class()->base_class()->name(), math);	classes().put(math->get_class()->base_class()->name(), math);
}	}

// prevent system classes from modification [calling add_method]
// ^process[$string:CLASS]{@method} prohibited from now on...
classes().for_each(lock_system_class, 0);
}	}

Request::~Request() {	Request::~Request() {
#ifdef XML	#ifdef XML
// 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(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors);	SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors);
free((void *)xml_generic_errors);	free((void *)xml_generic_errors);
}	}
#endif	#endif
}	}

Value* Request::get_self() { return method_frame?&method_frame->self():0; }	ValuePtr Request::get_self() { return method_frame?method_frame->get_self():ValuePtr(0); }

static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) {	static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) {
::charsets.load_charset(akey, avalue->as_string(0));	::charsets.load_charset(akey, avalue->as_string(0));
}	}
void Request::configure_admin(VStateless_class& conf_class, StringPtr source) {	void Request::configure_admin(VStateless_class& conf_class, const String* source) {
if(configure_admin_done)	if(configure_admin_done)
throw Exception("parser.runtime",	throw Exception("parser.runtime",
source,	source,
Line 172 void Request::configure_admin(VStateless	Line 197 void Request::configure_admin(VStateless
*/	*/
if(ValuePtr vcharsets=conf_class.get_element(charsets_name, conf_class, false)) {	if(ValuePtr vcharsets=conf_class.get_element(charsets_name, conf_class, false)) {
if(!vcharsets->is_string())	if(!vcharsets->is_string())
if(HashStringValue* charsets=vcharsets->get_hash(StringPtr(0)))	if(HashStringValue* charsets=vcharsets->get_hash(0))
charsets->for_each(load_charset, 0);	charsets->for_each(load_charset, 0);
else	else
throw Exception("parser.runtime",	throw Exception("parser.runtime",
Line 182 void Request::configure_admin(VStateless	Line 207 void Request::configure_admin(VStateless

// 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 207 struct timeval mt[10];	Line 232 struct timeval mt[10];
gettimeofday(&mt[0],NULL);	gettimeofday(&mt[0],NULL);
#endif	#endif
try {	try {
char auto_filespec=(char )malloc(MAX_STRING);

// loading config	// loading config
if(config_filespec) {	if(config_filespec) {
StringPtr filespec(new String);	const String& filespec(new String);
filespec->APPEND_CLEAN(config_filespec, 0, "config", 0);	filespec->APPEND_CLEAN(config_filespec, 0, "config", 0);
use_file(*main_class,	use_file(*main_class,
filespec, true/* ignore class_path */,	filespec, true/* ignore class_path */,
Line 232 gettimeofday(&mt[0],NULL);	Line 255 gettimeofday(&mt[0],NULL);

int step=0;	int step=0;
while(const char* before=strchr(after, '/')) {	while(const char* before=strchr(after, '/')) {
StringPtr sfile_spec(new String);	const String& sfile_spec(new String);
if(after!=request_info.path_translated) {	if(after!=request_info.path_translated) {
sfile_spec->APPEND_CLEAN(	sfile_spec->APPEND_CLEAN(
request_info.path_translated, before-request_info.path_translated,	request_info.path_translated, before-request_info.path_translated,
Line 248 gettimeofday(&mt[0],NULL);	Line 271 gettimeofday(&mt[0],NULL);
}	}

// compile requested file	// compile requested file
StringPtr spath_translated(new String);	const String& spath_translated(new String);
spath_translated->APPEND_TAINTED(request_info.path_translated, 0, "user-request", 0);	spath_translated->APPEND_TAINTED(request_info.path_translated, 0, "user-request", 0);
use_file(*main_class,	use_file(*main_class,
spath_translated, true/* ignore class_path */,	spath_translated, true/* ignore class_path */,
Line 256 gettimeofday(&mt[0],NULL);	Line 279 gettimeofday(&mt[0],NULL);

// configure method_frame options if not configured yet	// configure method_frame options if not configured yet
if(!configure_admin_done)	if(!configure_admin_done)
configure_admin(*main_class, StringPtr(0));	configure_admin(*main_class, 0);

// configure not-method_frame=user options	// configure not-method_frame=user options
methoded_array.configure_user(*this);	methoded_array().configure_user(*this);

// $MAIN:MIME-TYPES	// $MAIN:MIME-TYPES
if(ValuePtr element=main_class->get_element(mime_types_name, *main_class, false))	if(ValuePtr element=main_class->get_element(mime_types_name, *main_class, false))
Line 267 gettimeofday(&mt[0],NULL);	Line 290 gettimeofday(&mt[0],NULL);
mime_types=table;	mime_types=table;

// filling form fields	// filling form fields
form->fill_fields_and_tables(charsets, request_info);	form->fill_fields_and_tables(pool(), charsets, request_info);

// filling cookies	// filling cookies
cookie->fill_fields(pool(), request_info);	cookie->fill_fields(pool(), request_info);

// filling mail received	// filling mail received
mail->fill_received(pool(), request_info);	mail->fill_received(*this);

#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
//measure:after compile	//measure:after compile
gettimeofday(&mt[1],NULL);	gettimeofday(&mt[1],NULL);
#endif	#endif
// execute @main[]	// execute @main[]
StringPtr 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",
Exception::undefined_source,	Exception::undefined_source,
Line 291 gettimeofday(&mt[1],NULL);	Line 314 gettimeofday(&mt[1],NULL);
gettimeofday(&mt[2],NULL);	gettimeofday(&mt[2],NULL);
#endif	#endif

VStringPtr body_vstring_before_post_process(new VString(body_string));	Vconst String& body_vstring_before_post_process(new VString(body_string));
VStringPtr body_vstring_after_post_process(body_vstring_before_post_process);	Vconst String& body_vstring_after_post_process(body_vstring_before_post_process);
// @postprocess	// @postprocess
if(ValuePtr value=main_class->get_element(post_process_method_name, *main_class, false))	if(ValuePtr value=main_class->get_element(post_process_method_name, *main_class, false))
if(JunctionPtr junction=value->get_junction())	if(JunctionPtr 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(pool(), method->name, junction, 0/no parent*/);	VMethodFrame frame(pool(), method->name, junction, 0/no parent*/); frame.ref();
frame.set_self(*main_class);	frame.set_self(main_class);

frame.store_param(body_vstring_before_post_process);	frame.store_param(body_vstring_before_post_process);
body_vstring_after_post_process=	body_vstring_after_post_process=
VStringPtr(new VString(execute_method(frame, *method)));	VString* (new VString(execute_method(frame, *method)));
}	}

bool lorigins_mode=origins_mode();	bool lorigins_mode=origins_mode();

VFilePtr body_file=body_vstring_after_post_process->as_vfile(	VFilePtr body_file=body_vstring_after_post_process->as_vfile(pool(),
String::UL_UNSPECIFIED, lorigins_mode);	String::UL_UNSPECIFIED, lorigins_mode);

// extract response body	// extract response body
Line 319 gettimeofday(&mt[2],NULL);	Line 342 gettimeofday(&mt[2],NULL);
body_value=response->fields().get(body_name);	body_value=response->fields().get(body_name);

if(body_value) // there is some $response:body	if(body_value) // there is some $response:body
body_file=body_value->as_vfile(pool());	body_file=body_value->as_vfile();
else if(lorigins_mode)	else if(lorigins_mode)
response->fields().put(content_type_name,	response->fields().put(content_type_name,
ValuePtr(new VString(StringPtr(new String(ORIGINS_CONTENT_TYPE)))));	ValuePtr(new VString(String* (new String(ORIGINS_CONTENT_TYPE)))));

#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
//measure:after postprocess	//measure:after postprocess
Line 354 t[9]-t[3]	Line 377 t[9]-t[3]
// we're returning not result, but error explanation	// we're returning not result, but error explanation
try {	try {
// log the beast	// log the beast
if(StringPtr problem_source=e.problem_source())	if(const String* problem_source=e.problem_source())
SAPI::log(sapi_info,	SAPI::log(sapi_info,
"%s: "	"%s: "
#ifndef NO_STRING_ORIGIN	#ifndef NO_STRING_ORIGIN
Line 366 t[9]-t[3]	Line 389 t[9]-t[3]
problem_source->origin().file?problem_source->origin().file:"global",	problem_source->origin().file?problem_source->origin().file:"global",
problem_source->origin().line,	problem_source->origin().line,
#endif	#endif
problem_source->cstr(),	problem_source->cstr().get(),
e.comment(),	e.comment(),
e.type()	e.type()
);	);
Line 385 t[9]-t[3]	Line 408 t[9]-t[3]
response->fields().clear();	response->fields().clear();

// this is what we'd return in $response:body	// this is what we'd return in $response:body
StringPtr body_string(0);	const String& body_string(0);

// 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(ValuePtr value=main_class->get_element(	if(ValuePtr value=main_class->get_element(
StringPtr(new String(UNHANDLED_EXCEPTION_METHOD_NAME)),	String* (new String(UNHANDLED_EXCEPTION_METHOD_NAME)),
*main_class,	*main_class,
false)) {	false)) {
if(JunctionPtr junction=value->get_junction()) {	if(JunctionPtr 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(pool(), method->name, junction, 0/no caller*/);	VMethodFrame frame(pool(), method->name, junction, 0/no caller*/); frame.ref();
frame.set_self(*main_class);	frame.set_self(main_class);

// $exception	// $exception
frame.store_param(exception2vhash(e));	frame.store_param(exception2vhash(pool(), e));
// $stack[^table::set{name origin}]	// $stack[^table::set{name origin}]
Table::columns_type stack_trace_columns;	Table::columns_type stack_trace_columns(new ArrayString);
*stack_trace_columns+=StringPtr(new String("name"));	stack_trace_columns+=String (new String("name"));
*stack_trace_columns+=StringPtr(new String("file"));	stack_trace_columns+=String (new String("file"));
*stack_trace_columns+=StringPtr(new String("lineno"));	stack_trace_columns+=String (new String("lineno"));
TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns));	Table* stack_trace(new Table(Exception::undefined_source, stack_trace_columns));
Array_iterator<StringPtr> tracei(exception_trace);	Array_iterator<String* > tracei(exception_trace);
while(tracei.has_next()) {	while(tracei.has_next()) {
Table::element_type row;	Table::element_type row(new ArrayString);

StringPtr name=tracei.next();	const String& name=tracei.next();
*row+=name; // name column	*row+=name; // name column
#ifndef NO_STRING_ORIGIN	#ifndef NO_STRING_ORIGIN
const String_fragment::Origin& origin=name->origin();	const String_fragment::Origin& origin=name->origin();
if(origin.file) {	if(origin.file) {
*row+=StringPtr(new String(origin.file, 0, true)); // file column	row+=String (new String(origin.file, 0, true)); // file column
char buf=(char )malloc(MAX_NUMBER);	row+=String (new String(
size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line);	pool().format_integer(1+origin.line),
*row+=StringPtr(new String(buf, buf_size, true)); // line column	0, true)); // line column
}	}
#endif	#endif
*stack_trace+=row;	*stack_trace+=row;
Line 438 t[9]-t[3]	Line 461 t[9]-t[3]
// doing that ugly	// doing that ugly

// make up result: $origin $source $comment $type $code	// make up result: $origin $source $comment $type $code
char buf=(char )malloc(MAX_STRING);	char *buf=new char[MAX_STRING];
size_t printed=0;	size_t printed=0;
if(StringPtr problem_source=e.problem_source()) {	if(const String* problem_source=e.problem_source()) {
#ifndef NO_STRING_ORIGIN	#ifndef NO_STRING_ORIGIN
const String_fragment::Origin& origin=problem_source->origin();	const String_fragment::Origin& origin=problem_source->origin();
if(origin.file)	if(origin.file)
Line 450 t[9]-t[3]	Line 473 t[9]-t[3]
);	);
#endif	#endif
printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ",	printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ",
problem_source->cstr());	problem_source->cstr().get());
}	}
if(const char* comment=e.comment(true))	if(const char* comment=e.comment(true))
printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment);	printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment);
Line 459 t[9]-t[3]	Line 482 t[9]-t[3]

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

VString body_vstring(body_string);	VString body_vstring(body_string);
Line 475 t[9]-t[3]	Line 498 t[9]-t[3]
}	}
}	}

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

StringPtr file_spec;	const String& file_spec;
if(ignore_class_path) // ignore_class_path?	if(ignore_class_path) // ignore_class_path?
file_spec=file_name;	file_spec=file_name;
else if(file_name->first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH?	else if(file_name->first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH?
file_spec=absolute(file_name);	file_spec=absolute(file_name);
else {	else {
file_spec=StringPtr(0);	file_spec=0;
if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) {	if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) {
if(element->is_string()) {	if(element->is_string()) {
file_spec=file_readable(absolute(element->as_string(&pool())), file_name); // found at class_path?	file_spec=file_readable(absolute(element->as_string(&pool())), file_name); // found at class_path?
} else if(Table *table=element->get_table()) {	} else if(Table *table=element->get_table()) {
int size=table->count();	int size=table->count();
for(int i=size; i--; ) {	for(int i=size; i--; ) {
StringPtr path=(*table->get(i))[0];	const String& path=(*table->get(i))[0];
if(file_spec=file_readable(absolute(path), file_name))	if(file_spec=file_readable(absolute(path), file_name))
break; // found along class_path	break; // found along class_path
}	}
} else	} else
Line 517 VStateless_classPtr Request::use_file(VS	Line 540 VStateless_classPtr Request::use_file(VS

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

if(const char *source=file_read_text(pool(), charsets.source(), file_spec, fail_on_read_problem))	if(const char *source=file_read_text(pool(), charsets.source(), file_spec, fail_on_read_problem))
return use_buf(aclass, source, file_spec, file_spec->cstr(pool()));	use_buf(aclass, source, file_spec, file_spec->cstr());
else
return 0;
}	}


VStateless_classPtr Request::use_buf(VStateless_class& aclass,	void Request::use_buf(VStateless_class& aclass,
const char* source,	const char* source,
StringPtr filespec, const char* filespec_cstr) {	const String& filespec, const char* filespec_cstr) {
// 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, MethodPtr(0));	Temp_method temp_method_conf(aclass, conf_method_name, MethodPtr(0));
// temporary zero @auto so to maybe-replace it in compiled code	// temporary zero @auto so to maybe-replace it in compiled code
Line 538 VStateless_classPtr Request::use_buf(VSt	Line 559 VStateless_classPtr Request::use_buf(VSt
VStateless_class& cclass=COMPILE(&aclass, source, filespec_cstr);	VStateless_class& cclass=COMPILE(&aclass, source, filespec_cstr);

// locate and execute possible @conf[] static	// locate and execute possible @conf[] static
VStringPtr vfilespec(new VString(filespec));	Vconst String& vfilespec(new VString(filespec));
const Method *method_called;	Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass,
execute_nonvirtual_method(cclass,
conf_method_name, vfilespec,	conf_method_name, vfilespec,
false/no result needed/, &method_called);	false/no string result needed/);
if(method_called)	if(executed.method)
configure_admin(cclass, method_called->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,	auto_method_name, vfilespec,
0/no result needed/);	false/no result needed/);
return &cclass;
}	}

StringPtr Request::relative(const char* apath, StringPtr relative_name) {	const String& Request::relative(const char* apath, const String& relative_name) {
char *hpath=pool().copy(apath);	char *hpath=pool().copy(apath);
StringPtr result(new String);	const String& result(new String);
if(rsplit(hpath, '/')) // if something/splitted	if(rsplit(hpath, '/')) // if something/splitted
*result << hpath << "/";	*result << hpath << "/";
*result << relative_name;	*result << relative_name;
return result;	return result;
}	}

StringPtr Request::absolute(StringPtr relative_name) {	const String& Request::absolute(const String& relative_name) {
if(relative_name->first_char()=='/') {	if(relative_name->first_char()=='/') {
StringPtr result=StringPtr(new String(request_info.document_root));	const String& result=String* (new String(request_info.document_root));
*result << relative_name;	*result << relative_name;
return result;	return result;
} else	} else
Line 588 static void add_header_attribute(	Line 607 static void add_header_attribute(
}	}
void Request::output_result(VFilePtr body_file, bool header_only, bool as_attachment) {	void Request::output_result(VFilePtr body_file, bool header_only, bool as_attachment) {
// header: cookies	// header: cookies
cookie->output_result(sapi_info);	cookie->output_result(pool(), sapi_info);

ValuePtr body_file_content_type;	ValuePtr body_file_content_type;
// set content-type	// set content-type
Line 598 void Request::output_result(VFilePtr bod	Line 617 void Request::output_result(VFilePtr bod
} else {	} else {
// default content type	// default content type
response->fields().put_dont_replace(content_type_name,	response->fields().put_dont_replace(content_type_name,
ValuePtr(new VString(StringPtr(new String(DEFAULT_CONTENT_TYPE)))));	ValuePtr(new VString(String* (new String(DEFAULT_CONTENT_TYPE)))));
}	}

// content-disposition	// content-disposition
if(ValuePtr vfile_name=body_file->fields().get(name_name))	if(ValuePtr vfile_name=body_file->fields().get(name_name))
if(*vfile_name->get_string(&Pool())!=NONAME_DAT) {	if(*vfile_name->get_string(&fpool)!=NONAME_DAT) {
VHashPtr hash(new VHash);	VHashPtr hash(new VHash);
HashStringValue &h=hash->hash(Exception::undefined_source);	HashStringValue &h=hash->hash(Exception::undefined_source);
if(as_attachment)	if(as_attachment)
Line 644 void Request::output_result(VFilePtr bod	Line 663 void Request::output_result(VFilePtr bod
SAPI::send_body(sapi_info, client_body, client_content_length);	SAPI::send_body(sapi_info, client_body, client_content_length);
}	}

StringPtr 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);
if(mime_types->locate(0, sext.change_case(pool(), charsets.source(), String::CC_LOWER)))	if(mime_types->locate(0, sext.change_case(pool(), charsets.source(), String::CC_LOWER)))
if(StringPtr 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",
Line 657 StringPtr Request::mime_type_of(const ch	Line 676 StringPtr Request::mime_type_of(const ch
MIME_TYPES_NAME " table column elements must not be empty");	MIME_TYPES_NAME " table column elements must not be empty");
}	}

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

bool Request::origins_mode() {	bool Request::origins_mode() {
return main_class->get_element(origins_mode_name, *main_class, false)!=0; // $ORIGINS mode	return main_class->get_element(origins_mode_name, *main_class, false)!=0; // $ORIGINS mode
}	}

	#ifdef XML

	GdomeDOMString_auto_ptr Request::transcode(const String& s) {
	return charsets.source().transcode(s);
	}

	const String& Request::transcode(GdomeDOMString* s
	#ifndef NO_STRING_ORIGIN
	, const String& origin
	#endif
	) {
	return charsets.source().transcode(pool(), s
	#ifndef NO_STRING_ORIGIN
	, origin
	#endif
	);
	}

	const String& Request::transcode(xmlChar* s
	#ifndef NO_STRING_ORIGIN
	, const String& origin
	#endif
	) {
	return charsets.source().transcode(pool(), s
	#ifndef NO_STRING_ORIGIN
	, origin
	#endif
	);
	}
	#endif

E-mail:

Removed from v.1.245.2.7
changed lines
	Added in v.1.245.2.37.2.1