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.37.2.20 and 1.245.2.37.2.28

version 1.245.2.37.2.20, 2003/04/02 14:16:19	version 1.245.2.37.2.28, 2003/04/03 15:36:04
Line 48 const char* ORIGINS_CONTENT_TYPE="text/p	Line 48 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 BODY_NAME "body"	#define BODY_NAME "body"
	#define EXCEPTION_TYPE_PART_NAME "type"
	#define EXCEPTION_SOURCE_PART_NAME "source"
	#define EXCEPTION_COMMENT_PART_NAME "comment"
	#define EXCEPTION_HANDLED_PART_NAME "handled"

// globals	// globals

Line 57 const String content_disposition_name(CO	Line 61 const String content_disposition_name(CO
const String content_disposition_value(CONTENT_DISPOSITION_VALUE);	const String content_disposition_value(CONTENT_DISPOSITION_VALUE);
const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);	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_source_part_name(EXCEPTION_SOURCE_PART_NAME);
	const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME);
	const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME);

// defines for statics	// defines for statics

Line 83 static const String class_path_name(CLAS	Line 91 static const String class_path_name(CLAS

// op.C	// op.C
VStateless_class& VClassMAIN_create();	VStateless_class& VClassMAIN_create();
// op.C
VHash& exception2vhash(const Exception& e);

//	//
Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info,	Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info,
Line 127 Request::Request(SAPI_Info& asapi_info,	Line 133 Request::Request(SAPI_Info& asapi_info,
{	{
// file_no=0 => unknown	// file_no=0 => unknown
file_list+=StringBody("UNKNOWN");	file_list+=StringBody("UNKNOWN");
	file_list+=StringBody("-body of process-"); // pseudo_file_no__process

// maybe expire old caches	// maybe expire old caches
cache_managers.maybe_expire();	cache_managers.maybe_expire();
Line 239 gettimeofday(&mt[0],NULL);	Line 246 gettimeofday(&mt[0],NULL);
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(main_class,
filespec, true/* ignore class_path */,	filespec, 0 /main_alias/,
config_fail_on_read_problem, true/* file must exist if 'fail on read problem' not set */);	true /ignore class_path/,
	config_fail_on_read_problem,
	true /file must exist if 'fail on read problem' not set/);
}	}

// loading auto.p files from document_root/..	// loading auto.p files from document_root/..
Line 265 gettimeofday(&mt[0],NULL);	Line 274 gettimeofday(&mt[0],NULL);
sfile_spec << "/" AUTO_FILE_NAME;	sfile_spec << "/" AUTO_FILE_NAME;

use_file(main_class,	use_file(main_class,
sfile_spec, true/* ignore class_path */,	sfile_spec,
true/* fail on read problem /, false/ but ignore absence, sole user */);	0 /main_alias/,
	true /ignore class_path/,
	true /fail on read problem/,
	false /but ignore absence, sole user/);
}	}
after=before+1;	after=before+1;
}	}
Line 276 gettimeofday(&mt[0],NULL);	Line 288 gettimeofday(&mt[0],NULL);
String& spath_translated=*new String;	String& spath_translated=*new String;
spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED);	spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED);
use_file(main_class,	use_file(main_class,
spath_translated, true/* ignore class_path */,	spath_translated,
true/* fail on read problem/, true/ fail on abscence */);	0 /main_alias/,
	true /ignore class_path/);

// configure method_frame options if not configured yet	// configure method_frame options if not configured yet
if(!configure_admin_done)	if(!configure_admin_done)
Line 372 t[9]-t[3]	Line 385 t[9]-t[3]
#endif	#endif
} catch(const Exception& e) { // request handling problem	} catch(const Exception& e) { // request handling problem
// we're returning not result, but error explanation	// we're returning not result, but error explanation
try {	// try {
	#define PA_URI_FORMAT "%s: "
	#define PA_ORIGIN_FILE_POS_FORMAT "%s(%d:%d): "
	#define PA_SOURCE_FORMAT "'%s' "
	#define PA_COMMENT_TYPE_FORMAT "%s [%s]"
// log the beast	// log the beast
if(const String* problem_source=e.problem_source())	Request::Exception_details details=get_details(e);
SAPI::log(sapi_info,
"%s: "	if(details.problem_source) { // do we know the guy?
"'%s' %s [%s]",	if(details.trace) { // do whe know where he came from?
request_info.uri,	Operation::Origin origin=details.trace.origin();
problem_source->cstr(),	SAPI::log(sapi_info,
e.comment(),	PA_URI_FORMAT
e.type()	PA_ORIGIN_FILE_POS_FORMAT
);	PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT,
else	request_info.uri,
	file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col,
	details.problem_source->cstr(),
	e.comment(), e.type()
	);
	} else
	SAPI::log(sapi_info,
	PA_URI_FORMAT
	PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT,
	request_info.uri,
	details.problem_source->cstr(),
	e.comment(), e.type()
	);
	} else
SAPI::log(sapi_info,	SAPI::log(sapi_info,
"%s: "	PA_URI_FORMAT
"%s [%s]",	PA_COMMENT_TYPE_FORMAT,
request_info.uri,	request_info.uri,
e.comment(), e.type()	e.comment(), e.type()
);	);
Line 408 t[9]-t[3]	Line 438 t[9]-t[3]
false)) {	false)) {
if(Junction* junction=value->get_junction()) {	if(Junction* junction=value->get_junction()) {
if(const Method *method=junction->method) {	if(const Method *method=junction->method) {
// preparing to pass parameters to	// preparing to pass parameters to
// @unhandled_exception[exception;stack]	// @unhandled_exception[exception;stack]
VMethodFrame frame(/method->name, / junction, 0/no caller*/);	VMethodFrame frame(/method->name, / junction, 0/no caller*/);
frame.set_self(main_class);	frame.set_self(main_class);

// $exception	// $exception
frame.store_param(exception2vhash(e));	frame.store_param(details.vhash);
// $stack[^table::set{name origin}]	// $stack[^table::set{name origin}]
Table::columns_type stack_trace_columns(new ArrayString);	Table::columns_type stack_trace_columns(new ArrayString);
*stack_trace_columns+=new String("name");	*stack_trace_columns+=new String("name");
*stack_trace_columns+=new String("file");	*stack_trace_columns+=new String("file");
*stack_trace_columns+=new String("lineno");	*stack_trace_columns+=new String("lineno");
Table& stack_trace=*new Table(stack_trace_columns);	*stack_trace_columns+=new String("colno");
/Array_iterator<String> tracei(exception_trace);	Table& stack_trace=*new Table(stack_trace_columns);
while(tracei.has_next()) {	if(!exception_trace.is_empty()/signed!/)
Table::element_type row(new ArrayString);	for(size_t i=exception_trace.bottom_index(); i<=exception_trace.top_index(); i++) {
	Trace trace=exception_trace.get(i);
const String* name=tracei.next();	Table::element_type row(new ArrayString);
*row+=name; // name column
#ifndef NO_STRING_ORIGIN	*row+=trace.name(); // name column
const String_fragment::Origin& origin=name->origin();	Operation::Origin origin=trace.origin();
if(origin.file) {	if(origin.file_no) {
*row+=StringBody(origin.file, 0, true)); // file column	*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column
*row+=StringBody(	*row+=new String(StringBody::Format(1+origin.line), String::L_CLEAN); // 'lineno' column
format_integer(1+origin.line),	*row+=new String(StringBody::Format(1+origin.col), String::L_CLEAN); // 'colno' column
0, true)); // line column	}
}	stack_trace+=row;
#endif	}
*stack_trace+=row;	frame.store_param(*new VTable(&stack_trace));
}*/
frame.store_param(*new VTable(&stack_trace));	// future $response:body=
	// execute ^unhandled_exception[exception;stack]
// future $response:body=	body_string=&execute_method(frame, *method);
// execute ^unhandled_exception[exception;stack]
body_string=&execute_method(frame, *method);
}	}
}	}
}	}
Line 457 t[9]-t[3]	Line 485 t[9]-t[3]
/*const String_fragment::Origin& origin=problem_source->origin();	/*const String_fragment::Origin& origin=problem_source->origin();
if(origin.file)	if(origin.file)
printed+=snprintf(buf+printed, MAX_STRING-printed,	printed+=snprintf(buf+printed, MAX_STRING-printed,
ORIGIN_FILE_LINE_FORMAT": ",	PA_ORIGIN_FILE_POS_FORMAT,
origin.file, 1+origin.line	origin.file, 1+origin.line
);	);
printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ",	printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ",
Line 481 t[9]-t[3]	Line 509 t[9]-t[3]

// 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& ) {	// } catch(const Exception& ) {
rethrow;	// rethrow;
}	// }
}	}
}	}

	size_t Request::register_file(StringBody file_spec) {
	file_list+=file_spec;
	return file_list.count()-1;
	}

void Request::use_file(VStateless_class& aclass,	void Request::use_file(VStateless_class& aclass,
const String& file_name, bool ignore_class_path,	const String& file_name, const String* main_alias,
bool fail_on_read_problem, bool fail_on_file_absence) {	bool ignore_class_path,
	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;	return;
used_files.put(file_name, true);	used_files.put(file_name, true);


const String* 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=0;	file_spec=0;
Line 532 void Request::use_file(VStateless_class&	Line 566 void Request::use_file(VStateless_class&
if(!entry_exists(*file_spec))	if(!entry_exists(*file_spec))
return;	return;

file_list+=file_name;
if(const char* source=file_read_text(charsets.source(), *file_spec, fail_on_read_problem))	if(const char* source=file_read_text(charsets.source(), *file_spec, fail_on_read_problem))
use_buf(aclass, source, file_list.count()-1);	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 char* source, const String* main_alias,
uint file_no) {	uint file_no) {
// 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);
Line 547 void Request::use_buf(VStateless_class&	Line 580 void Request::use_buf(VStateless_class&
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 class
VStateless_class& cclass=compile(&aclass, source, file_no);	VStateless_class& cclass=compile(&aclass, source, main_alias, file_no);

// locate and execute possible @conf[] static	// locate and execute possible @conf[] static
VString* vfilespec=	VString* vfilespec=
Line 689 const String& Request::transcode(xmlChar	Line 722 const String& Request::transcode(xmlChar
return charsets.source().transcode(s);	return charsets.source().transcode(s);
}	}
#endif	#endif


	const Request::Trace Request::Exception_trace::extract_origin(const String*& problem_source) {
	Trace result;
	if(!is_empty()) {
	result=bottom_value();
	if(!problem_source) { // we don't know who trigged the bug?
	problem_source=result.name(); // consider the stack-top-guy did that
	fbottom++;
	} else if(result.name()==problem_source) // it is that same guy?
	fbottom++; // throw away that trace
	// else stack top contains not us,
	// leaving result intact
	// it would help ^throw
	}

	return result;
	}

	Request::Exception_details Request::get_details(const Exception& e) {
	const String* problem_source=e.problem_source();
	Trace trace=exception_trace.extract_origin(problem_source);

	VHash& vhash=*new VHash; HashStringValue& hash=vhash.hash();

	// $.type
	if(const char* type=e.type(true))
	hash.put(exception_type_part_name, new VString(*new String(type)));

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

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

	// $.file lineno colno
	if(trace) {
	const Operation::Origin origin=trace.origin();
	hash.put(StringBody("file"),
	new VString(*new String(file_list[origin.file_no], String::L_TAINTED)));
	hash.put(StringBody("lineno"), new VInt(1+origin.line));
	hash.put(StringBody("colno"), new VInt(1+origin.col));
	}

	// $.comment
	if(const char* comment=e.comment(true))
	hash.put(exception_comment_part_name,
	new VString(new String(comment, 0, true/tainted*/)));

	// $.handled(0)
	hash.put(exception_handled_part_name, new VBool(false));

	return Request::Exception_details(trace, problem_source, vhash);
	}

	//

E-mail:

Removed from v.1.245.2.37.2.20
changed lines
	Added in v.1.245.2.37.2.28