--- parser3/src/include/pa_request.h	2009/08/14 23:36:45	1.197
+++ parser3/src/include/pa_request.h	2013/08/21 12:11:14	1.212
@@ -1,14 +1,14 @@
 /** @file
 	Parser: request class decl.
 
-	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)
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char * const IDENT_REQUEST_H="$Date: 2009/08/14 23:36:45 $";
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.212 2013/08/21 12:11:14 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -20,10 +20,6 @@ static const char * const IDENT_REQUEST_
 #include "pa_sapi.h"
 #include "pa_vconsole.h"
 
-#ifdef RESOURCES_DEBUG
-#include <sys/resource.h>
-#endif
-
 // consts
 
 const uint ANTI_ENDLESS_EXECUTE_RECOURSION=1000;
@@ -122,6 +118,7 @@ private:
 
 	/// already used files to avoid cyclic uses
 	HashString<bool> used_files;
+	HashString<bool> searched_along_class_path;
 	/// list of all used files, Operation::file_no = index to it
 	Array<String::Body> file_list;
 
@@ -182,8 +179,7 @@ public:
 #endif	
 
 	Request(SAPI_Info& asapi_info, Request_info& arequest_info,
-		String::Language adefault_lang, ///< all tainted data default untainting lang
-		bool status_allowed ///<  status class allowed
+		String::Language adefault_lang ///< all tainted data default untainting lang
 	);
 	~Request();
 
@@ -205,7 +201,8 @@ public:
 	void execute(ArrayOperation& ops); // execute.C
 	void op_call(VMethodFrame &frame);
 	void op_call_write(VMethodFrame &frame);
-	void op_call(VMethodFrame &frame, bool constructing);
+	Value& construct(Value &class_value, const Method &method);
+
 	/// execute ops with anti-recoursion check
 	void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) {
 		// anti_endless_execute_recoursion
@@ -219,21 +216,26 @@ public:
 		anti_endless_execute_recoursion--;
 	}
 
+	///
+	void use_file_directly(VStateless_class& aclass,
+				const String& file_spec,
+				bool fail_on_read_problem=true, 
+				bool fail_on_file_absence=true);
+				
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
 	void use_file(VStateless_class& aclass,
-		const String& file_name, 
-		const String* main_alias=0,
-		bool ignore_class_path=false, 
-		bool fail_on_read_problem=true, 
-		bool fail_on_file_absence=true); // pa_request.C
+		const String& file_name,
+		const String* use_filespec);
+
 	/// compiles a @a source buffer
 	void use_buf(VStateless_class& aclass,
 		const char* source, 
 		const String* main_alias,
 		uint file_no,
-		int line_no_offset=0); // pa_request.C
+		int line_no_offset=0);
 
 	/// processes any code-junction there may be inside of @a value
+	StringOrValue process_getter(Junction& junction); // execute.C
 	StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C
 	void process_write(Value& input_value); // execute.C
 	//@{ convinient helpers
@@ -244,7 +246,8 @@ public:
 		return process(input_value, intercept_string).as_value();
 	}
 	//@}
-
+	const String* get_method_filename(const Method* method); // execute.C
+	const String* get_used_filename(uint file_no);
 	
 #define DEFINE_DUAL(modification) \
 	void write_##modification##_lang(StringOrValue dual) { \
@@ -294,6 +297,9 @@ public:
 	/// returns an absolute @a path to relative @a name
 	const String& absolute(const String& relative_name);
 
+	/// returns the mime type of 'user_file_name'
+	const String& mime_type_of(const String* file_name);
+
 	/// returns the mime type of 'user_file_name_cstr'
 	const String& mime_type_of(const char* user_file_name_cstr);
 
@@ -357,11 +363,15 @@ public: // status read methods
 	}
 	*/
 
+	/// public for ^reflection:copy[]
+	void put_element(Value& ncontext, const String& name, Value* value);
+
 	/// for @main[]
 	const String* execute_virtual_method(Value& aself, const String& method_name);
 
-	/// for @postprocess[body]
-	StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method);
+	/// executes parser method, use op_call(frame) to execute native method
+	void execute_method(VMethodFrame& aframe);
+
 	//{ for @conf[filespec] and @auto[filespec] and parser://method/call
 	const String* execute_method(Value& aself, 
 		const Method& method, Value* optional_param,
@@ -407,7 +417,6 @@ private: // compile.C
 
 private: // execute.C
 
-	void put_element(Value& ncontext, const String& name, Value* value);
 	Value& get_element(Value& ncontext, const String& name);
 
 private: // defaults
@@ -530,12 +539,6 @@ public:
 
 // defines for externs
 
-#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding"
-#define CONTENT_DISPOSITION_NAME "content-disposition"
-#define CONTENT_DISPOSITION_ATTACHMENT "attachment"
-#define CONTENT_DISPOSITION_INLINE "inline"
-#define CONTENT_DISPOSITION_FILENAME_NAME "filename"
-
 #define EXCEPTION_HANDLED_PART_NAME "handled"
 
 
@@ -545,12 +548,6 @@ extern const String main_method_name;
 extern const String auto_method_name;
 extern const String body_name;
 
-extern const String content_transfer_encoding_name;
-extern const String content_disposition_name;
-extern const String content_disposition_attachment;
-extern const String content_disposition_inline;
-extern const String content_disposition_filename_name;
-
 extern const String exception_type_part_name;
 extern const String exception_source_part_name;
 extern const String exception_comment_part_name;