--- parser3/src/main/pa_request.C	2011/11/23 11:41:22	1.328
+++ parser3/src/main/pa_request.C	2013/07/23 14:29:02	1.333
@@ -1,12 +1,10 @@
 /** @file
 	Parser: request class main part. @see compile.C and execute.C.
 
-	Copyright (c) 2001-2009 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)
 */
 
-static const char * const IDENT_REQUEST_C="$Date: 2011/11/23 11:41:22 $";
-
 #include "pa_sapi.h"
 #include "pa_common.h"
 #include "pa_request.h"
@@ -34,6 +32,8 @@ static const char * const IDENT_REQUEST_
 #include "pa_vconsole.h"
 #include "pa_vdate.h"
 
+volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.333 2013/07/23 14:29:02 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"
@@ -71,6 +71,7 @@ const String exception_handled_part_name
 
 #define CHARSETS_NAME "CHARSETS"
 #define MIME_TYPES_NAME "MIME-TYPES"
+#define STRICT_VARS_NAME "STRICT-VARS"
 #define ORIGINS_MODE_NAME "ORIGINS"
 #define CONF_METHOD_NAME "conf"
 #define POST_PROCESS_METHOD_NAME "postprocess"
@@ -83,6 +84,7 @@ const String exception_handled_part_name
 static const String charsets_name(CHARSETS_NAME);
 static const String main_class_name(MAIN_CLASS_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 conf_method_name(CONF_METHOD_NAME);
 static const String post_process_method_name(POST_PROCESS_METHOD_NAME);
@@ -113,12 +115,6 @@ Request::Request(SAPI_Info& asapi_info,
 	fin_cycle(0),
 
 	// public
-#ifdef RESOURCES_DEBUG
-	sql_connect_time(0),
-	sql_request_time(0),
-#endif	
-
-	// public
 	request_info(arequest_info),
 	sapi_info(asapi_info),
 	charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets
@@ -248,6 +244,18 @@ void Request::configure_admin(VStateless
 					"$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash");
 	}
 
+#ifdef STRICT_VARS
+	VVoid::strict_vars=false;
+	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
 	//	until someone with less privileges have overriden them
 	methoded_array().configure_admin(*this);
@@ -318,12 +326,6 @@ void Request::configure() {
 
 */
 void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) {
-#ifdef RESOURCES_DEBUG
-//measures
-struct timeval mt[10];
-//measure:before all
-gettimeofday(&mt[0],NULL);
-#endif
 	try {
 		// filling mail received
 		mail.fill_received(*this);
@@ -378,10 +380,6 @@ gettimeofday(&mt[0],NULL);
 			rethrow;
 		}
 
-#ifdef RESOURCES_DEBUG
-//measure:after compile
-gettimeofday(&mt[1],NULL);
-#endif
 		// execute @main[]
 		const String* body_string=execute_virtual_method(main_class, main_method_name);
 		if(!body_string)
@@ -389,11 +387,6 @@ gettimeofday(&mt[1],NULL);
 				0,
 				"'"MAIN_METHOD_NAME"' method not found");
 
-#ifdef RESOURCES_DEBUG
-		//measure:after main
-gettimeofday(&mt[2],NULL);
-#endif
-
 		// extract response body
 		Value* body_value=response.fields().get(download_name); // $response:download?
 		bool as_attachment=body_value!=0;
@@ -418,32 +411,9 @@ gettimeofday(&mt[2],NULL);
 
 		VFile* body_file=body_value->as_vfile(flang, &charsets);
 
-#ifdef RESOURCES_DEBUG
-//measure:after postprocess
-gettimeofday(&mt[3],NULL);		
-#endif
-
 		// OK. write out the result
 		output_result(body_file, header_only, as_attachment);
 
-#ifdef RESOURCES_DEBUG
-		//measure:after output_result
-gettimeofday(&mt[9],NULL);		
-t[9]=mt[9].tv_sec+mt[9].tv_usec/1000000.0;
-
-double t[10];
-for(int i=0;i<10;i++)
-    t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
-//measure:log2 compile,main,postprocess,output
-SAPI::log("rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", 
-request_info.uri,
-t[1]-t[0],
-t[2]-t[1],
-t[3]-t[2],
-sql_connect_time,sql_request_time,
-t[9]-t[3]
-);
-#endif
 	} catch(const Exception& e) { // request handling problem
 		try {
 		// we're returning not result, but error explanation
@@ -578,9 +548,9 @@ void Request::use_file(VStateless_class&
 	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
-		int afterslash=lastposafter(*use_filespec, 0, "/", 1, true);
-		if(afterslash>0)
-			filespec=file_exist(use_filespec->mid(0, afterslash-1), file_name); // found in current dir?
+		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){