--- parser3/src/include/pa_request.h	2001/03/13 19:35:04	1.52
+++ parser3/src/include/pa_request.h	2001/03/16 09:26:42	1.55
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.52 2001/03/13 19:35:04 paf Exp $
+	$Id: pa_request.h,v 1.55 2001/03/16 09:26:42 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -42,11 +42,19 @@ class Request : public Pooled {
 	friend Temp_lang;
 public:
 	
+	struct Info {
+		const char *document_root;
+		const char *path_translated;
+		const char *request_method;
+		const char *query_string;
+		const char *request_uri;
+		const char *content_type;
+		size_t content_length;
+	};
+	
 	Request(Pool& apool,
-		String::Untaint_lang alang,
-
-		const char *adocument_root,
-		const char *apage_filespec		
+		Info& ainfo,
+		String::Untaint_lang alang
 	);
 	~Request() {}
 
@@ -73,25 +81,29 @@ public:
 		const String *name=0,
 		bool intercept_string=true); // execute.C
 
+	// write(const) = clean
 	void write(const String& astring) {
-		wcontext->write(astring, String::Untaint_lang::NO);  // write(const) = clean
+		wcontext->write(astring, String::Untaint_lang::NO);
 	}
+	// appending, sure of clean string inside
 	void write_no_lang(String& astring) {
-		// appending, sure of clean string inside
 		wcontext->write(astring, String::Untaint_lang::NO);
 	}
-
+	// appending possible string, assigning untaint language
 	void write_assign_lang(Value& avalue) {
-		// appending possible string, assigning untaint language
 		wcontext->write(avalue, flang); 
 	}
+	// appending possible string, passing language built into string being written
 	void write_pass_lang(Value& avalue) {
-		// appending possible string, passing language built into string being written
 		wcontext->write(avalue, String::Untaint_lang::PASS_APPENDED); 
 	}
+	// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
-		// appending sure value, no strings inside
-		wcontext->write(avalue, String::Untaint_lang::NO); 
+		wcontext->write(avalue, String::Untaint_lang::NO);
+	}
+	// appending sure value, not VString
+	void write_expr_result(Value& avalue) {
+		wcontext->write(avalue); 
 	}
 
 	void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg);
@@ -101,6 +113,9 @@ public:
 
 public:
 	
+	//
+	Info& info;
+
 	// default base
 	VClass root_class;
 	// $env:fields here
@@ -146,11 +161,6 @@ private: // lang manipulation
 		flang=alang;
 	}
 
-private: // web
-
-	const char *fdocument_root;
-	const char *fpage_filespec;
-
 };
 
 class Temp_lang {