--- parser3/src/include/pa_request.h	2001/03/21 14:06:43	1.65
+++ parser3/src/include/pa_request.h	2001/04/04 06:16:19	1.76
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.65 2001/03/21 14:06:43 paf Exp $
+	$Id: pa_request.h,v 1.76 2001/04/04 06:16:19 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -59,6 +59,7 @@ public:
 		const char *content_type;
 		size_t content_length;
 		const char *cookie;
+		const char *user_agent;
 	};
 	
 	Request(Pool& apool,
@@ -76,8 +77,10 @@ public:
 		BEWARE: may throw exception to you: catch it!
 	*/
 	void core(
-		const char *sys_auto_path1,
-		const char *sys_auto_path2,
+		const char *root_auto_path, ///< path to system auto.p file
+		bool root_auto_fail, ///< fail if system auto.p file not found
+		const char *site_auto_path, ///< path to site auto.p file
+		bool site_auto_fail, ///< fail if site auto.p file not found
 		bool header_only);
 
 	/// executes ops
@@ -85,7 +88,7 @@ public:
 
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
 	VStateless_class *use_file(
-		const char *file, bool fail_on_read_problem=true,
+		const String& file_spec, bool fail_on_read_problem=true,
 		const String *name=0, 
 		VStateless_class *base_class=0); // core.C
 	/// compiles a @a source buffer
@@ -101,7 +104,7 @@ public:
 
 	/// appending, sure of clean string inside
 	void write_no_lang(const String& astring) {
-		wcontext->write(astring, String::UL_NO);
+		wcontext->write(astring, String::UL_CLEAN);
 	}
 	/// appending string, passing language built into string being written
 	void write_pass_lang(const String& astring) {
@@ -117,7 +120,7 @@ public:
 	}
 	/// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
-		wcontext->write(avalue, String::UL_NO);
+		wcontext->write(avalue, String::UL_CLEAN);
 	}
 	/// appending sure value, not VString
 	void write_expr_result(Value& avalue) {
@@ -129,10 +132,10 @@ public:
 		const String& method_name, const char *msg);
 
 	/// returns relative to @a path  path to @a file 
-	char *relative(const char *path, const char *file);
+	const String& relative(const char *apath, const String& relative_name);
 
 	/// returns an absolute @a path to relative @a name
-	char *absolute(const char *name);
+	const String& absolute(const String& relative_name);
 
 public:
 	
@@ -152,16 +155,25 @@ public:
 	/// $cookie:
 	VCookie cookie;
 
+	/// $MAIN:MIME-TYPES
+	Table *mime_types;
+
 	/// contexts
 	Value *self, *root, *rcontext;
 	/// contexts
 	WContext *wcontext;
 
+	/// connection
+	const String *connection;
+
 private: // core data
 
 	// classes
 	Hash fclasses;
 
+	// already used files to avoid cyclic uses
+	Hash used_files;
+
 	// execution stack
 	Stack stack;
 
@@ -185,7 +197,7 @@ private: // lang&raw
 private: // defaults
 
 	const String::Untaint_lang fdefault_lang;
-	Value *fdefault_content_type;
+	Value *default_content_type;
 
 private: // lang manipulation
 
@@ -200,7 +212,7 @@ private: // lang manipulation
 
 private:
 
-	void output_result(const String& body_string, bool header_only);
+	void output_result(const VFile& body_file, bool header_only);
 };
 
 ///	Auto-object used for temporary changing Request::flang.