--- parser3/src/include/pa_request.h	2002/09/18 12:40:38	1.149
+++ parser3/src/include/pa_request.h	2003/01/28 15:16:49	1.160.2.2
@@ -1,14 +1,14 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (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* IDENT_REQUEST_H="$Date: 2002/09/18 12:40:38 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/01/28 15:16:49 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -40,19 +40,15 @@ const uint ANTI_ENDLESS_EXECUTE_RECOURSI
 
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
-		const char *source, \
-		VStateless_class *aclass, const String *name, \
-		VStateless_class *base_class, \
-		const char *file
-#	define COMPILE(source, aclass, name, base_class, file)  \
-		real_compile(source, aclass, name, base_class, file)
+		VStateless_class& aclass, const char *source \
+		, const char *file
+#	define COMPILE(aclass, source, file)  \
+		real_compile(aclass, source, file)
 #else
 #	define COMPILE_PARAMS  \
-		const char *source, \
-		VStateless_class *aclass, const String *name, \
-		VStateless_class *base_class
-#	define COMPILE(source, aclass, name, base_class, file)  \
-		real_compile(source, aclass, name, base_class)
+		VStateless_class& aclass, const char *source
+#	define COMPILE(aclass, source, file)  \
+		real_compile(aclass, source)
 #endif
 
 class Temp_lang;
@@ -64,8 +60,11 @@ class Request : public Pooled {
 	friend class Temp_lang;
 	friend class Temp_connection;
 	friend class Request_context_saver;
+	friend class Temp_request_self;
 public:
 
+	Pool& pool() { return fpool; }
+
 #ifdef RESOURCES_DEBUG
 	/// measures
 	double sql_connect_time;
@@ -86,7 +85,7 @@ public:
 		bool mail_received;
 	};
 	
-	Request(Pool& apool,
+	Request(
 		Info& ainfo,
 		uchar adefault_lang, ///< all tainted data default untainting lang
 		bool status_allowed ///<  status class allowed
@@ -122,17 +121,14 @@ public:
 	}
 
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
-	VStateless_class *use_file(
+	VStateless_class *use_file(VStateless_class& aclass,
 		const String& file_name, 
 		bool ignore_class_path=false, 
-		bool fail_on_read_problem=true, bool fail_on_file_absence=true,
-		const String *name=0, 
-		VStateless_class *base_class=0); // core.C
+		bool fail_on_read_problem=true, bool fail_on_file_absence=true); // core.C
 	/// compiles a @a source buffer
-	VStateless_class *use_buf(
-		const char *source, const String& filespec, const char *filespec_cstr,
-		VStateless_class *aclass=0, const String *name=0, 
-		VStateless_class *base_class=0); // core.C
+	VStateless_class *use_buf(VStateless_class& aclass,
+		const char *source, 
+		const String& filespec, const char *filespec_cstr); // core.C
 
 	/// processes any code-junction there may be inside of @a value
 	StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C
@@ -220,9 +216,10 @@ public:
 		return fconnection; 
 	}
 
-	bool origins_mode() {
-		return main_class->get_element(*origins_mode_name, main_class, false)!=0;  // $ORIGINS mode
-	}
+	bool origins_mode();
+
+	void interrupt() { finterrupted=true; }
+	bool interrupted() { return finterrupted; }
 
 public:
 	
@@ -231,11 +228,14 @@ public:
 	/// user's post data
 	const char *post_data;  size_t post_size;
 
+	/// source, client, mail charsets
+	Request_charsets charsets;
+
 	/// name of 'main' method
 	const String main_method_name;
 	
-	/// operators are methods of this class
-	Methoded& OP;
+	/// 'MAIN' class conglomerat & operators are methods of this class
+	VClass& main_class;
 	/// $env:fields
 	VEnv env;
 	/// $status:fields
@@ -253,21 +253,19 @@ public:
 	/// $cookie:elements
 	VCookie cookie;
 
-	/// 'MAIN' class conglomerat
-	VStateless_class *main_class;
-
 	/// classes configured data
 	Hash classes_conf;
 
 private:
 
+	Pool fpool;
+
 	//@{ request processing status
 	/// exception stack trace
 	Stack exception_trace;
 	/// execution stack
 	Stack stack;
 	/// contexts
-	Value *self;
 	VMethodFrame *method_frame;
 	Value *rcontext;
 	WContext *wcontext;
@@ -276,11 +274,13 @@ private:
 	/// current connection
 	SQL_Connection *fconnection;
 	//@}
+	/// interrupted flag, raised on signals [SIGPIPE]
+	bool finterrupted;
 
 public: // status read methods
 
-	Value *get_self() { return self; }
 	VMethodFrame *get_method_frame() { return method_frame; }
+	Value *get_self();
 
 private: // core data
 
@@ -358,12 +358,11 @@ private: // connection manipulation
 
 private:
 
-	void output_result(const VFile& body_file, bool header_only);
+	void output_result(const VFile& body_file, bool header_only, bool as_attachment);
 };
 
 /// Auto-object used to save request context across ^try body
 class Request_context_saver {
-
 	Request& fr;
 
 	/// exception stack trace
@@ -371,7 +370,6 @@ class Request_context_saver {
 	/// execution stack
 	int stack;
 	/// contexts
-	Value *self;
 	VMethodFrame *method_frame;
 	Value *rcontext;
 	WContext *wcontext;
@@ -384,17 +382,16 @@ public:
 	Request_context_saver(Request& ar) : 
 		exception_trace(ar.exception_trace.top_index()),	
 		stack(ar.stack.top_index()),
-		self(ar.self),
 		method_frame(ar.method_frame),
 		rcontext(ar.rcontext),
 		wcontext(ar.wcontext),
 		flang(ar.flang),
 		fconnection(ar.fconnection),
 		fr(ar) {}
-	~Request_context_saver() {
+	void restore() {
 		fr.exception_trace.top_index(exception_trace);
 		fr.stack.top_index(stack);
-		fr.self=self; fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
+		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
 		fr.flang=flang;
 		fr.fconnection=fconnection;
 	}