--- parser3/src/include/pa_request.h	2001/03/20 06:45:18	1.64
+++ parser3/src/include/pa_request.h	2001/03/20 18:24:43	1.64.2.3
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.64 2001/03/20 06:45:18 paf Exp $
+	$Id: pa_request.h,v 1.64.2.3 2001/03/20 18:24:43 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -49,7 +49,8 @@ class Request : public Pooled {
 public:
 
 	/// some information from web server
-	struct Info {
+	class Info {
+	public:
 		const char *document_root;
 		const char *path_translated;
 		const char *method;
@@ -93,17 +94,13 @@ 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);
-	}
 	/// appending, sure of clean string inside
-	void write_no_lang(String& astring) {
-		wcontext->write(astring, String::Untaint_lang::NO);
+	void write_no_lang(const String& astring) {
+		wcontext->write(astring, String::UL_NO);
 	}
 	/// appending string, passing language built into string being written
-	void write_pass_lang(String& astring) {
-		wcontext->write(astring, String::Untaint_lang::PASS_APPENDED); 
+	void write_pass_lang(const String& astring) {
+		wcontext->write(astring, String::UL_PASS_APPENDED); 
 	}
 	/// appending possible string, assigning untaint language
 	void write_assign_lang(Value& avalue) {
@@ -111,11 +108,11 @@ public:
 	}
 	/// appending possible string, passing language built into string being written
 	void write_pass_lang(Value& avalue) {
-		wcontext->write(avalue, String::Untaint_lang::PASS_APPENDED); 
+		wcontext->write(avalue, String::UL_PASS_APPENDED); 
 	}
 	/// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
-		wcontext->write(avalue, String::Untaint_lang::NO);
+		wcontext->write(avalue, String::UL_NO);
 	}
 	/// appending sure value, not VString
 	void write_expr_result(Value& avalue) {
@@ -123,7 +120,8 @@ public:
 	}
 
 	/// handy is-value-a-junction ensurer
-	void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg);
+	void fail_if_junction_(bool is, Value& value, 
+		const String& method_name, const char *msg);
 
 	/// returns relative to @a path  path to @a file 
 	char *relative(const char *path, const char *file);