--- parser3/src/main/pa_request.C	2006/12/19 19:06:10	1.283
+++ parser3/src/main/pa_request.C	2009/07/06 12:07:04	1.304
@@ -1,11 +1,11 @@
 /** @file
 	Parser: request class main part. @see compile.C and execute.C.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_REQUEST_C="$Date: 2006/12/19 19:06:10 $";
+static const char * const IDENT_REQUEST_C="$Date: 2009/07/06 12:07:04 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -58,9 +58,10 @@ const char* ORIGINS_CONTENT_TYPE="text/p
 
 const String main_method_name(MAIN_METHOD_NAME);
 const String auto_method_name(AUTO_METHOD_NAME);
+const String content_transfer_encoding_name(CONTENT_TRANSFER_ENCODING_NAME);
 const String content_disposition_name(CONTENT_DISPOSITION_NAME);
 const String content_disposition_inline(CONTENT_DISPOSITION_INLINE);
-const String content_disposition_value(CONTENT_DISPOSITION_VALUE);
+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 exception_type_part_name(EXCEPTION_TYPE_PART_NAME);
@@ -125,7 +126,8 @@ Request::Request(SAPI_Info& asapi_info,
 	form(*new VForm(charsets, arequest_info)),
 	mail(*new VMail),
 	response(*new VResponse(arequest_info, charsets)),
-	cookie(*new VCookie),
+	cookie(*new VCookie(charsets, arequest_info)),
+	console(*new VConsole),
 
 	// private
 	configure_admin_done(false),
@@ -158,12 +160,11 @@ Request::Request(SAPI_Info& asapi_info,
 	if(status_allowed)
 		classes().put(String::Body(STATUS_CLASS_NAME), new VStatus());
 	// 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));	
 	// cookie class
 	classes().put(String::Body(COOKIE_CLASS_NAME), &cookie);
 	// console class
-	classes().put(String::Body(CONSOLE_CLASS_NAME), new VConsole());
-
+	classes().put(String::Body(CONSOLE_CLASS_NAME), &console);
 	/// methoded
 	// response class
 	classes().put(response.get_class()->name(), &response);
@@ -205,7 +206,7 @@ static void load_charset(HashStringValue
 }
 void Request::configure_admin(VStateless_class& conf_class) {
 	if(configure_admin_done)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 		0,
 		"parser already configured");
 	configure_admin_done=true;
@@ -223,7 +224,7 @@ void Request::configure_admin(VStateless
 			if(HashStringValue* charsets=vcharsets->get_hash())
 				charsets->for_each<Request_charsets*>(load_charset, &this->charsets);
 			else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");
 	}
@@ -305,9 +306,6 @@ struct timeval mt[10];
 gettimeofday(&mt[0],NULL);
 #endif
 	try {
-		// filling cookies
-		cookie.fill_fields(request_info);
-
 		// filling mail received
 		mail.fill_received(*this);
 
@@ -374,7 +372,7 @@ gettimeofday(&mt[1],NULL);
 		// execute @main[]
 		const String* body_string=execute_virtual_method(main_class, main_method_name);
 		if(!body_string)
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"'"MAIN_METHOD_NAME"' method not found");
 
@@ -390,13 +388,6 @@ gettimeofday(&mt[2],NULL);
 			body_value=response.fields().get(body_name); // $response:body
 		if(!body_value)
 			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
 		if(Value* value=main_class.get_element(post_process_method_name, main_class, false))
@@ -407,12 +398,11 @@ gettimeofday(&mt[2],NULL);
 					VMethodFrame frame(/*method->name, */ *junction, 0/*no parent*/);
 					frame.set_self(main_class);
 
-					frame.store_param(*body_value);
+					frame.store_params(&body_value, 1);
 					body_value=&execute_method(frame, *method).as_value();
 				}
 
-		VFile* body_file=body_value->as_vfile(
-			String::L_UNSPECIFIED, &charsets);
+		VFile* body_file=body_value->as_vfile(flang, &charsets);
 
 #ifdef RESOURCES_DEBUG
 //measure:after postprocess
@@ -464,40 +454,40 @@ t[9]-t[3]
 				false)) {
 			if(Junction* junction=value->get_junction()) {
 				if(const Method *method=junction->method) {
-// preparing to pass parameters to 
-//	@unhandled_exception[exception;stack]
-VMethodFrame frame(/*method->name, */ *junction, 0/*no caller*/);
-frame.set_self(main_class);
-
-// $exception
-frame.store_param(details.vhash);
-// $stack[^table::set{name	origin}]
-Table::columns_type stack_trace_columns(new ArrayString);
-*stack_trace_columns+=new String("name");
-*stack_trace_columns+=new String("file");
-*stack_trace_columns+=new String("lineno");
-*stack_trace_columns+=new String("colno");
-Table& stack_trace=*new Table(stack_trace_columns);
-if(!exception_trace.is_empty()/*signed!*/) 
-for(size_t i=exception_trace.bottom_index(); i<exception_trace.top_index(); i++) {
-	Trace trace=exception_trace.get(i);
-	Table::element_type row(new ArrayString);
-
-	*row+=trace.name(); // name column
-	Operation::Origin origin=trace.origin();
-	if(origin.file_no) {
-		*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column
-		*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
-	}
-	stack_trace+=row;
-}
-frame.store_param(*new VTable(&stack_trace));
-
-// future $response:body=
-//   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)
-body_string=&execute_method(frame, *method).as_string();
+					// preparing to pass parameters to 
+					//	@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);
+					*stack_trace_columns+=new String("name");
+					*stack_trace_columns+=new String("file");
+					*stack_trace_columns+=new String("lineno");
+					*stack_trace_columns+=new String("colno");
+					Table& stack_trace=*new Table(stack_trace_columns);
+					if(!exception_trace.is_empty()/*signed!*/) 
+						for(size_t i=exception_trace.bottom_index(); i<exception_trace.top_index(); i++) {
+							Trace trace=exception_trace.get(i);
+							Table::element_type row(new ArrayString);
+
+							*row+=trace.name(); // name column
+							Operation::Origin origin=trace.origin();
+							if(origin.file_no) {
+								*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column
+								*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
+							}
+							stack_trace+=row;
+						}
+
+					Value *params[]={&details.vhash, new VTable(&stack_trace)};
+					frame.store_params(params, 2);
+
+					// future $response:body=
+					//   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)
+					body_string=&execute_method(frame, *method).as_string();
 				}
 			}
 		}
@@ -513,7 +503,7 @@ body_string=&execute_method(frame, *meth
 		}
 
 		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);
@@ -523,6 +513,7 @@ body_string=&execute_method(frame, *meth
 
 		// ERROR. write it out
 		output_result(body_file, header_only, false);
+
 		} catch(const Exception& e) { // exception in unhandled exception
 			Request::Exception_details details=get_details(e);
 			const char* exception_cstr=get_exception_cstr(e, details);
@@ -570,16 +561,16 @@ void Request::use_file(VStateless_class&
 						break; // found along class_path
 				}
 			} else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"$" CLASS_PATH_NAME " must be string or table");
 			if(!file_spec)
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&file_name,
 					"not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME);
 		}
 		if(!file_spec)
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				&file_name,
 				"usage failed - no $" MAIN_CLASS_NAME  ":" CLASS_PATH_NAME " were specified");
 	}
@@ -602,22 +593,27 @@ void Request::use_buf(VStateless_class&
 	// temporary zero @auto so to maybe-replace it in compiled code
 	Temp_method temp_method_auto(aclass, auto_method_name, 0);
 
-	// compile loaded class
-	VStateless_class& cclass=compile(&aclass, source, main_alias, file_no, line_no_offset);
+	// compile loaded classes
+	ArrayClass& cclasses=compile(&aclass, source, main_alias, file_no, line_no_offset);
 
-	// locate and execute possible @conf[] static
 	VString* vfilespec=
 		new VString(*new String(file_list[file_no], String::L_TAINTED));
-	Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, 
-		conf_method_name, vfilespec,
-		false/*no string result needed*/);
-	if(executed.method)
-		configure_admin(cclass/*, executed.method->name*/);
-
-	// locate and execute possible @auto[] static
-	execute_nonvirtual_method(cclass, 
-		auto_method_name, vfilespec,
-		false/*no result needed*/);
+
+	for(size_t i=0; i<cclasses.count(); i++){
+		VStateless_class& cclass=*cclasses.get(i);
+
+		// locate and execute possible @conf[] static
+		Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, 
+			conf_method_name, vfilespec,
+			false/*no string result needed*/);
+		if(executed.method)
+			configure_admin(cclass/*, executed.method->name*/);
+
+		// locate and execute possible @auto[] static
+		execute_nonvirtual_method(cclass, 
+			auto_method_name, vfilespec,
+			false/*no result needed*/);
+	}
 }
 
 const String& Request::relative(const char* apath, const String& relative_name) {
@@ -657,22 +653,23 @@ public:
 };
 #endif
 static void add_header_attribute(
-				 HashStringValue::key_type aattribute, 
-				 HashStringValue::value_type ameaning, 
+				 HashStringValue::key_type name, 
+				 HashStringValue::value_type value, 
 				 Add_header_attribute_info* info) {
-	if(aattribute==BODY_NAME
-		|| aattribute==DOWNLOAD_NAME
-		|| aattribute==CHARSET_NAME)
+	if(name==BODY_NAME
+		|| name==DOWNLOAD_NAME
+		|| name==CHARSET_NAME)
 		return;
+	
+	const char* aname=String(name, String::L_TAINT).taint_cstr(String::L_URI, 0, &info->r.charsets);
 
-	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));
+			aname, 
+			attributed_meaning_to_string(*value, String::L_URI, false).untaint_cstr(String::L_AS_IS, 0, &info->r.charsets)
+		);
 
-	if(strcasecmp(a, "last-modified")==0)
-		info->add_last_modified = false;
+	if(strcasecmp(aname, "last-modified")==0)
+		info->add_last_modified=false;
 }
 
 static void output_sole_piece(Request& r,
@@ -839,9 +836,7 @@ void Request::output_result(VFile* body_
 		if(sfile_name!=NONAME_DAT) {
 			VHash& hash=*new VHash();
 			HashStringValue &h=hash.hash();
-			h.put(value_name, new VString(content_disposition_value));
-
-			h.put(value_name, new VString( as_attachment ? content_disposition_value : content_disposition_inline ));
+			h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline ));
 
 			h.put(content_disposition_filename_name, vfile_name);
 			response.fields().put(content_disposition_name, &hash);
@@ -882,7 +877,7 @@ void Request::output_result(VFile* body_
 			if(Value* vdatep=v->as(VDATE_TYPE, false))
 				vdate=static_cast<VDate*>(vdatep);
 			else 
-				throw Exception("parser.runtime", 0, "mdate must be a date");
+				throw Exception(PARSER_RUNTIME, 0, "mdate must be a date");
 		}
 		if(!vdate)
 			vdate=new VDate(mtime);
@@ -907,7 +902,7 @@ const String& Request::mime_type_of(cons
 					if(const String* result=mime_types->item(1))
 						return *result;
 				else
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
 						MIME_TYPES_NAME  " table column elements must not be empty");
 		}
@@ -979,10 +974,10 @@ Request::Exception_details Request::get_
 	// $.comment
 	if(const char* comment=e.comment(true))
 		hash.put(exception_comment_part_name, 
-			new VString(*new String(comment, 0, true/*tainted*/)));
+			new VString(*new String(comment, String::L_TAINTED)));
 
 	// $.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);
 }