--- parser3/src/main/pa_request.C	2017/01/23 20:05:57	1.371
+++ parser3/src/main/pa_request.C	2020/10/27 22:12:40	1.383
@@ -1,12 +1,13 @@
 /** @file
 	Parser: request class main part. @see compile.C and execute.C.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #include "pa_sapi.h"
 #include "pa_common.h"
+#include "pa_os.h"
 #include "pa_request.h"
 #include "pa_wwrapper.h"
 #include "pa_vclass.h"
@@ -32,15 +33,12 @@
 #include "pa_vconsole.h"
 #include "pa_vdate.h"
 
-volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.371 2017/01/23 20:05:57 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H;
+volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.383 2020/10/27 22:12:40 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H;
 
 // consts
 
 #define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception"
 
-/// content type of exception response, when no @MAIN:exception handler defined
-const char* UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain";
-
 /// content type of response when no $MAIN:defaults.content-type defined
 const char* DEFAULT_CONTENT_TYPE="text/html";
 
@@ -89,6 +87,7 @@ size_t pa_file_size_limit=FILE_SIZE_LIMI
 #define LOOP_LIMIT_NAME "max_loop"
 #define RECOURSION_LIMIT_NAME "max_recoursion"
 #define FILE_SIZE_LIMIT_NAME "max_file_size"
+#define LOCK_WAIT_TIMEOUT_NAME "lock_wait_timeout"
 #define CONF_METHOD_NAME "conf"
 #define POST_PROCESS_METHOD_NAME "postprocess"
 #define CLASS_PATH_NAME "CLASS_PATH"
@@ -108,6 +107,7 @@ static const String limits_name(LIMITS_N
 static const String loop_limit_name(LOOP_LIMIT_NAME);
 static const String recoursion_limit_name(RECOURSION_LIMIT_NAME);
 static const String file_size_limit_name(FILE_SIZE_LIMIT_NAME);
+static const String lock_wait_timeout_name(LOCK_WAIT_TIMEOUT_NAME);
 
 static const String conf_method_name(CONF_METHOD_NAME);
 static const String post_process_method_name(POST_PROCESS_METHOD_NAME);
@@ -226,7 +226,7 @@ Value& Request::get_self() { return meth
 VStateless_class* Request::get_class(const String& name){
 	VStateless_class* result=classes().get(name);
 	if(!result)
-		if(const Method *method=main_class.get_method(autouse_method_name)){
+		if(const Method *method=main_class.get_element_method(autouse_method_name)){
 			Value *vname=new VString(name);
 			CONSTRUCTOR_FRAME_ACTION(*method, 0 /*no parent*/, main_class, {
 				frame.store_params(&vname, 1);
@@ -319,6 +319,18 @@ void Request::configure_admin(VStateless
 				throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be number");
 		}
 
+	pa_lock_attempts=PA_LOCK_ATTEMPTS;
+	if(limits)
+		if(Value* lock_wait_timeout=limits->get_element(lock_wait_timeout_name)) {
+			if(lock_wait_timeout->is_evaluated_expr()) {
+				double limit=lock_wait_timeout->as_double();
+				if(limit >= 3600*24)
+					throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be less then %d", 3600*24);
+				pa_lock_attempts=(unsigned int)(limit*2)+1;
+			} else
+				throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be number");
+		}
+
 	// configure method_frame options
 	//	until someone with less privileges have overriden them
 	methoded_array().configure_admin(*this);
@@ -434,7 +446,7 @@ void Request::core(const char* config_fi
 		}
 
 		// execute @main[]
-		const String* body_string=execute_virtual_method(main_class, main_method_name);
+		const String* body_string=execute_method(main_class, main_method_name);
 		if(!body_string)
 			throw Exception(PARSER_RUNTIME, 0, "'" MAIN_METHOD_NAME "' method not found");
 
@@ -447,17 +459,15 @@ void Request::core(const char* config_fi
 			body_value=new VString(*body_string); // just result of ^main[]
 
 		// @postprocess
-		if(Value* value=main_class.get_element(post_process_method_name))
-			if(Junction* junction=value->get_junction())
-				if(const Method *method=junction->method) {
-					// preparing to pass parameters to 
-					//	@postprocess[data]
-					METHOD_FRAME_ACTION(*method, 0 /*no parent*/, main_class, {
-						frame.store_params(&body_value, 1);
-						call(frame);
-						body_value=&frame.result();
-					});
-				}
+		if(const Method *method=main_class.get_method(post_process_method_name)) {
+			// preparing to pass parameters to
+			//	@postprocess[data]
+			METHOD_FRAME_ACTION(*method, 0 /*no parent*/, main_class, {
+				frame.store_params(&body_value, 1);
+				call(frame);
+				body_value=&frame.result();
+			});
+		}
 
 		VFile* body_file=body_value->as_vfile(flang, &charsets);
 
@@ -482,76 +492,65 @@ void Request::core(const char* config_fi
 
 		// maybe we'd be lucky enough as to report an error
 		// in a gracefull way...
-		if(Value* value=main_class.get_element(*new String(UNHANDLED_EXCEPTION_METHOD_NAME))) {
-			if(Junction* junction=value->get_junction()) {
-				if(const Method *method=junction->method) {
-					// preparing to pass parameters to 
-					//	@unhandled_exception[exception;stack]
-
-					// $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;
-						}
-
-					// 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)
-
-					Value *params[]={&details.vhash, new VTable(&stack_trace)};
-					METHOD_FRAME_ACTION(*method, 0 /*no caller*/, main_class, {
-						frame.store_params(params, 2);
-						call(frame);
-						body_string=&frame.result().as_string();
-					});
+		if(const Method *method=main_class.get_method(*new String(UNHANDLED_EXCEPTION_METHOD_NAME))) {
+			// preparing to pass parameters to 
+			//	@unhandled_exception[exception;stack]
+
+			// $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;
 				}
-			}
-		}
-		
-		if(!body_string) {  // couldn't report an error beautifully?
-			// doing that ugly
-
-			// future $response:content-type
-			response.fields().put(content_type_name_upper, new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE)));
-			// future $response:body
-			body_string=new String(exception_cstr);
-		}
 
-		VString body_vstring(*body_string);
-		VFile* body_file=body_vstring.as_vfile(flang, &charsets);
+			// 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)
 
+			Value *params[]={&details.vhash, new VTable(&stack_trace)};
+			METHOD_FRAME_ACTION(*method, 0 /*no caller*/, main_class, {
+				frame.store_params(params, 2);
+				call(frame);
+				body_string=&frame.result().as_string();
+			});
+		}
+		
 		// 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
-		output_result(body_file, header_only, false);
+		if(body_string) {  // could report an error beautifully?
+			VString body_vstring(*body_string);
+			VFile* body_file=body_vstring.as_vfile(flang, &charsets);
+			// write it out the error
+			output_result(body_file, header_only, false);
+		} else {
+			// doing that ugly
+			SAPI::send_error(sapi_info, exception_cstr, !strcmp(e.type(), "file.missing") ? "404" : "500");
+		}
 
 		} catch(const Exception& e) { // exception in unhandled exception
 			Request::Exception_details details=get_details(e);
 			const char* exception_cstr=get_exception_cstr(e, details);
-			// unconditionally log the beast
-			SAPI::log(sapi_info, "%s", exception_cstr);
-
-			throw Exception(0, 0, "in %s", exception_cstr);
+			// unconditionally log the beast in exception handler
+			throw Exception(0, 0, "Unhandled exception in %s", exception_cstr);
 		}
 	}
 }
@@ -651,12 +650,11 @@ void Request::use_buf(VStateless_class&
 		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)
+		if(execute_method_if_exists(cclass, conf_method_name, vfilespec))
 			configure_admin(cclass/*, executed.method->name*/);
 
 		// locate and execute possible @auto[] static
-		execute_nonvirtual_method(cclass, auto_method_name, vfilespec, false/*no result needed*/);
+		execute_method_if_exists(cclass, auto_method_name, vfilespec);
 
 		cclass.enable_default_setter();
 	}
@@ -762,7 +760,7 @@ static void parse_range(const String* s,
 static void output_pieces(Request& r, bool header_only, const String& filename, size_t content_length, Value& date, bool add_last_modified) {
 	SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes");
 
-	const size_t BUFSIZE = 10*0x400;
+	const size_t BUFSIZE = 128*0x400;
 	char buf[BUFSIZE];
 	const char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE");
 	size_t offset=0;
@@ -815,10 +813,8 @@ static void output_pieces(Request& r, bo
 		size_t to_read = 0;
 		size_t size = 0;
 		do{
-			to_read = part_length<BUFSIZE?part_length:BUFSIZE;
-			File_read_result read_result=file_read(r.charsets, filespec, 
-				false /*as text*/,  0/*params*/, true/*fail on problem*/,
-				buf, offset, to_read);
+			to_read = part_length < BUFSIZE ? part_length : BUFSIZE;
+			File_read_result read_result=file_read_binary(filespec, true /*fail on problem*/, buf, offset, to_read);
 			to_read=read_result.length;
 			if(to_read == 0)
 				break;