--- parser3/src/classes/op.C	2012/06/04 13:46:18	1.210
+++ parser3/src/classes/op.C	2013/07/23 14:29:01	1.214
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.210 2012/06/04 13:46:18 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.214 2013/07/23 14:29:01 moko Exp $";
 
 // limits
 
@@ -145,7 +145,7 @@ static void _taint(Request& r, MethodPar
 static void _apply_taint(Request& r, MethodParams& params) {
 	String::Language lang=params.count()==1 ? String::L_AS_IS : get_untaint_lang(params.as_string(0, "lang must be string"));
 	const String &sbody=params.as_string(params.count()-1, "body must be string");
-	String::Body result_body=sbody.cstr_to_string_body_untaint(lang, 0, &r.charsets);
+	String::Body result_body=sbody.cstr_to_string_body_untaint(lang, r.connection(false), &r.charsets);
 	r.write_pass_lang(*new String(result_body, String::L_AS_IS));
 }
 
@@ -175,36 +175,30 @@ static void _process(Request& r, MethodP
 		// temporary zero @auto so it wouldn't be auto-called in Request::use_buf
 		Temp_method temp_method_auto(*target_class, auto_method_name, 0);
 
-		size_t options_index=index+1;
-		HashStringValue* options=0;
-		if(options_index<params.count()) {
-			Value& voptions=params.as_no_junction(options_index, OPTIONS_MUST_NOT_BE_CODE);
-			options=voptions.get_hash();
-			if(!options)
-				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
-		}
-
 		const String* main_alias=0;
 		const String* file_alias=0;
 		int line_no_alias_offset=0;
-		if(options) {
-			int valid_options=0;
-			if(Value* vmain_alias=options->get(PROCESS_MAIN_OPTION_NAME)) {
-				valid_options++;
-				main_alias=&vmain_alias->as_string();
-			}
-			if(Value* vfile_alias=options->get(PROCESS_FILE_OPTION_NAME)) {
-				valid_options++;
-				file_alias=&vfile_alias->as_string();
-			}
-			if(Value* vline_no_alias_offset=options->get(PROCESS_LINENO_OPTION_NAME)) {
-				valid_options++;
-				line_no_alias_offset=vline_no_alias_offset->as_int();
+
+		size_t options_index=index+1;
+		if(options_index<params.count())
+			if(HashStringValue* options=params.as_hash(options_index)) {
+				int valid_options=0;
+				if(Value* vmain_alias=options->get(PROCESS_MAIN_OPTION_NAME)) {
+					valid_options++;
+					main_alias=&vmain_alias->as_string();
+				}
+				if(Value* vfile_alias=options->get(PROCESS_FILE_OPTION_NAME)) {
+					valid_options++;
+					file_alias=&vfile_alias->as_string();
+				}
+				if(Value* vline_no_alias_offset=options->get(PROCESS_LINENO_OPTION_NAME)) {
+					valid_options++;
+					line_no_alias_offset=vline_no_alias_offset->as_int();
+				}
+		
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
-	
-			if(valid_options!=options->count())
-				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
-		}
 
 		uint processe_file_no=file_alias?
 			r.register_file(r.absolute(*file_alias))
@@ -384,9 +378,6 @@ static void _eval(Request& r, MethodPara
 }
 
 static void _connect(Request& r, MethodParams& params) {
-#ifdef RESOURCES_DEBUG
-struct timeval mt[2];
-#endif
 	Value& url=params.as_no_junction(0, "url must not be code");
 	Value& body_code=params.as_junction(1, "body must be code");
 
@@ -397,27 +388,14 @@ struct timeval mt[2];
 		}
 	}
 
-#ifdef RESOURCES_DEBUG
-//measure:before
-gettimeofday(&mt[0],NULL);
-#endif
 	// connect
 	SQL_Connection* connection=SQL_driver_manager->get_connection(url.as_string(), 
 		protocol2driver_and_client,
 		r.charsets.source().NAME().cstr(),
 		r.request_info.document_root);
 
-#ifdef RESOURCES_DEBUG
-//measure:after connect
-gettimeofday(&mt[1],NULL);
-
-double t[2];
-for(int i=0;i<2;i++)
-    t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
-
-r.sql_connect_time+=t[1]-t[0];
-#endif
 	Temp_connection temp_connection(r, connection);
+
 	// execute body
 	try {
 		r.process_write(body_code);