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.296 and 1.331

version 1.296, 2008/06/11 11:38:41	version 1.331, 2012/05/24 12:50:20
Line 1	Line 1
/** @file	/** @file
Parser: request class main part. @see compile.C and execute.C.	Parser: request class main part. @see compile.C and execute.C.

Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-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 14 static const char * const IDENT_REQUEST_	Line 12 static const char * const IDENT_REQUEST_
#include "pa_vclass.h"	#include "pa_vclass.h"
#include "pa_globals.h"	#include "pa_globals.h"
#include "pa_vint.h"	#include "pa_vint.h"
#include "pa_vmethod_frame_global.h"	#include "pa_vmethod_frame.h"
#include "pa_types.h"	#include "pa_types.h"
#include "pa_venv.h"	#include "pa_venv.h"
#include "pa_vmath.h"	#include "pa_vmath.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"
Line 58 const char* ORIGINS_CONTENT_TYPE="text/p	Line 59 const char* ORIGINS_CONTENT_TYPE="text/p

const String main_method_name(MAIN_METHOD_NAME);	const String main_method_name(MAIN_METHOD_NAME);
const String auto_method_name(AUTO_METHOD_NAME);	const String auto_method_name(AUTO_METHOD_NAME);
const String content_transfer_encoding_name(CONTENT_TRANSFER_ENCODING_NAME);	const String autouse_method_name(AUTOUSE_METHOD_NAME);
const String content_disposition_name(CONTENT_DISPOSITION_NAME);
const String content_disposition_inline(CONTENT_DISPOSITION_INLINE);
const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT);
const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
const String body_name(BODY_NAME);	const String body_name(BODY_NAME);
const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME);	const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME);
const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME);	const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME);
Line 73 const String exception_handled_part_name	Line 71 const String exception_handled_part_name

#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"
Line 85 const String exception_handled_part_name	Line 84 const String exception_handled_part_name
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);
Line 99 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),
	anti_endless_json_string_recoursion(0),

// public	// public
method_frame(0),	method_frame(0),
Line 109 Request::Request(SAPI_Info& asapi_info,	Line 110 Request::Request(SAPI_Info& asapi_info,
wcontext(0),	wcontext(0),
flang(adefault_lang),	flang(adefault_lang),
fconnection(0),	fconnection(0),
finterrupted(false),fskip(SKIP_NOTHING),	finterrupted(false),
	fskip(SKIP_NOTHING),
	fin_cycle(0),

// public	// public
#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
Line 126 Request::Request(SAPI_Info& asapi_info,	Line 129 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),	console(*new VConsole),

// private	// private
Line 157 Request::Request(SAPI_Info& asapi_info,	Line 160 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, form));	classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets, form));
// cookie class	// cookie class
Line 198 Request::~Request() {	Line 200 Request::~Request() {

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

	Value* Request::get_class(const String& name){
	Value* result=classes().get(name);
	if(!result)
	if(Value* value=main_class.get_element(autouse_method_name))
	if(Junction* junction=value->get_junction())
	if(const Method *method=junction->method) {
	Value *vname=new VString(name);
	VMethodFrame frame(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 219 void Request::configure_admin(VStateless	Line 240 void Request::configure_admin(VStateless
...	...
]	]
*/	*/
if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) {	if(Value* vcharsets=conf_class.get_element(charsets_name)) {
if(!vcharsets->is_string())	if(!vcharsets->is_string())
if(HashStringValue* charsets=vcharsets->get_hash())	if(HashStringValue* charsets=vcharsets->get_hash())
charsets->for_each<Request_charsets*>(load_charset, &this->charsets);	charsets->for_each<Request_charsets*>(load_charset, &this->charsets);
Line 229 void Request::configure_admin(VStateless	Line 250 void Request::configure_admin(VStateless
"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");	"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");
}	}

	#ifdef STRICT_VARS
	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 283 void Request::configure() {	Line 315 void Request::configure() {
methoded_array().configure_user(*this);	methoded_array().configure_user(*this);

// $MAIN:MIME-TYPES	// $MAIN:MIME-TYPES
if(Value* element=main_class.get_element(mime_types_name, main_class, false))	if(Value* element=main_class.get_element(mime_types_name))
if(Table *table=element->get_table())	if(Table *table=element->get_table())
mime_types=table;	mime_types=table;
}	}
Line 306 struct timeval mt[10];	Line 338 struct timeval mt[10];
gettimeofday(&mt[0],NULL);	gettimeofday(&mt[0],NULL);
#endif	#endif
try {	try {
// filling cookies
cookie.fill_fields(request_info);

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

// 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/);
}	}
Line 342 gettimeofday(&mt[0],NULL);	Line 370 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++);
}	}
}	}

Line 357 gettimeofday(&mt[0],NULL);	Line 383 gettimeofday(&mt[0],NULL);
// compile requested file	// compile requested file
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_directly(main_class, spath_translated);
spath_translated,
0 /main_alias/,
true /ignore class_path/);

configure();	configure();
} catch(...) {	} catch(...) {
Line 391 gettimeofday(&mt[2],NULL);	Line 414 gettimeofday(&mt[2],NULL);
body_value=response.fields().get(body_name); // $response:body	body_value=response.fields().get(body_name); // $response:body
if(!body_value)	if(!body_value)
body_value=new VString(*body_string); // just result of ^main[]	body_value=new VString(*body_string); // just result of ^main[]
// ensure that body_value has no just L_TAINTED parts left
if(body_value->is_string())
{
String& untainted=*new String();
untainted.append(*body_value->get_string(), flang);
body_value=new VString(untainted);
}

// @postprocess	// @postprocess
if(Value* value=main_class.get_element(post_process_method_name, main_class, false))	if(Value* value=main_class.get_element(post_process_method_name))
if(Junction* junction=value->get_junction())	if(Junction* junction=value->get_junction())
if(const Method *method=junction->method) {	if(const Method *method=junction->method) {
// preparing to pass parameters to	// preparing to pass parameters to
// @postprocess[data]	// @postprocess[data]
VMethodFrameGlobal 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);

	body_value=&frame.result().as_value();
}	}

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

#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
//measure:after postprocess	//measure:after postprocess
Line 459 t[9]-t[3]	Line 475 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]
VMethodFrameGlobal frame(/method->name, / junction, 0/no caller*/);
frame.set_self(main_class);

// $exception
frame.store_param(details.vhash);
// $stack[^table::create{name file lineno colno}]	// $stack[^table::create{name file lineno colno}]
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");
Line 494 t[9]-t[3]	Line 503 t[9]-t[3]
stack_trace+=row;	stack_trace+=row;
}	}

frame.store_param(*new VTable(&stack_trace));

// future $response:body=	// future $response:body=
// execute ^unhandled_exception[exception;stack]	// execute ^unhandled_exception[exception;stack]
exception_trace.clear(); // forget all about previous life, in case there would be error inside of this method, error handled would not be mislead by old stack contents (see extract_origin)	exception_trace.clear(); // forget all about previous life, in case there would be error inside of this method, error handled would not be mislead by old stack contents (see extract_origin)
body_string=&execute_method(frame, *method).as_string();
	VMethodFrame frame(method, 0 /no caller*/, main_class);
	Value *params[]={&details.vhash, new VTable(&stack_trace)};

	frame.store_params(params, 2);
	execute_method(frame);

	body_string=&frame.result().as_string();
}	}
}	}
}	}
Line 508 t[9]-t[3]	Line 522 t[9]-t[3]
// doing that ugly	// doing that ugly

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

VString body_vstring(*body_string);	VString body_vstring(*body_string);
VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets);	VFile* body_file=body_vstring.as_vfile(flang, &charsets);

// conditionally log it	// conditionally log it
Value* vhandled=details.vhash.hash().get(exception_handled_part_name);	Value* vhandled=details.vhash.hash().get(exception_handled_part_name);
Line 545 uint Request::register_file(String::Body	Line 558 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);

const String* file_spec;	if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for
if(ignore_class_path) // ignore_class_path?	if(!entry_exists(file_spec))
file_spec=&file_name;	return;
else if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH]
file_spec=&absolute(file_name);	if(const char* source=file_read_text(charsets, file_spec, fail_on_read_problem))
else {	use_buf(aclass, source, 0, register_file(file_spec));
file_spec=0;	}
if(Value* element=main_class.get_element(class_path_name, main_class, false)) {

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

	if(file_name.is_empty())
	throw Exception(PARSER_RUNTIME,
	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_exist(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_exist(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
Line 673 static void add_header_attribute(	Line 705 static void add_header_attribute(
\|\| name==CHARSET_NAME)	\|\| name==CHARSET_NAME)
return;	return;

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

SAPI::add_header_attribute(info->r.sapi_info,	SAPI::add_header_attribute(info->r.sapi_info,
aname,	aname,
attributed_meaning_to_string(*value, String::L_URI, false).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets));	attributed_meaning_to_string(*value, String::L_URI, false).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets)
	);

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

static void output_sole_piece(Request& r,	static void output_sole_piece(Request& r,
Line 694 static void output_sole_piece(Request& r	Line 727 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 714 struct Range	Line 745 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 744 static void output_pieces(Request& r,	Line 774 static void output_pieces(Request& r,
Value& date,	Value& date,
bool add_last_modified)	bool add_last_modified)
{	{
SAPI::add_header_attribute(r.sapi_info, "Accept-Ranges", "bytes");	SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes");

const size_t BUFSIZE = 10*0x400;	const size_t BUFSIZE = 10*0x400;
char buf[BUFSIZE];	char buf[BUFSIZE];
Line 758 static void output_pieces(Request& r,	Line 788 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 772 static void output_pieces(Request& r,	Line 802 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 823 void Request::output_result(VFile* body_	Line 851 void Request::output_result(VFile* body_
// header: cookies	// header: cookies
cookie.output_result(sapi_info);	cookie.output_result(sapi_info);

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

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

char* name_cstr=sfile_name.cstrm();
if(char *after_slash=rsplit(name_cstr, '\\'))	if(char *after_slash=rsplit(name_cstr, '\\'))
name_cstr=after_slash;	name_cstr=after_slash;
if(char *after_slash=rsplit(name_cstr, '/'))	if(char *after_slash=rsplit(name_cstr, '/'))
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) {
Line 848 void Request::output_result(VFile* body_	Line 873 void Request::output_result(VFile* body_
VHash& hash=*new VHash();	VHash& hash=*new VHash();
HashStringValue &h=hash.hash();	HashStringValue &h=hash.hash();
h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline ));	h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline ));
	h.put(content_disposition_filename_name, new VString(String(sfile_name, String::L_HTTP_HEADER)));

h.put(content_disposition_filename_name, vfile_name);	response.fields().put(content_disposition, &hash);
response.fields().put(content_disposition_name, &hash);

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

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

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

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

if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) {	if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) {
	// $response:[download\|body][$.file[filespec]] -- optput specified file
const String& sresponse_body_file=vresponse_body_file->as_string();	const String& sresponse_body_file=vresponse_body_file->as_string();
size_t content_length=0;	size_t content_length=0;
time_t atime=0, mtime=0, ctime=0;	time_t atime=0, mtime=0, ctime=0;
Line 885 void Request::output_result(VFile* body_	Line 906 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");
Line 899 void Request::output_result(VFile* body_	Line 920 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,
Line 921 const String& Request::mime_type_of(cons	Line 950 const String& Request::mime_type_of(cons
return *new String("application/octet-stream");	return *new String("application/octet-stream");
}	}

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

#ifdef XML	#ifdef XML
xmlChar* Request::transcode(const String& s) {	xmlChar* Request::transcode(const String& s) {
return charsets.source().transcode(s);	return charsets.source().transcode(s);
Line 967 Request::Exception_details Request::get_	Line 1002 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 985 Request::Exception_details Request::get_	Line 1018 Request::Exception_details Request::get_
// $.comment	// $.comment
if(const char* comment=e.comment(true))	if(const char* comment=e.comment(true))
hash.put(exception_comment_part_name,	hash.put(exception_comment_part_name,
new VString(new String(comment, 0, true/tainted*/)));	new VString(*new String(comment, String::L_TAINTED)));

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

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

E-mail:

Removed from v.1.296
changed lines
	Added in v.1.331