--- parser3/src/include/pa_request.h	2013/10/17 21:52:32	1.214
+++ parser3/src/include/pa_request.h	2015/04/08 18:08:52	1.217
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.214 2013/10/17 21:52:32 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.217 2015/04/08 18:08:52 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -18,7 +18,6 @@
 #include "pa_request_info.h"
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
-#include "pa_vconsole.h"
 
 // consts
 
@@ -35,6 +34,7 @@ class VForm;
 class VResponse;
 class VCookie;
 class VStateless_class;
+class VConsole;
 
 /// Main workhorse.
 class Request: public PA_Object {
@@ -263,7 +263,7 @@ public:
 	/// appending, sure of clean string inside
 	void write_no_lang(const String& astring) {
 		wcontext->write(astring, 
-			(String::Language)(String::L_CLEAN | flang&String::L_OPTIMIZE_BIT));
+			(String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) ));
 	}
 	/// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
@@ -271,7 +271,7 @@ public:
 			wcontext->write(avalue);
 		else
 			wcontext->write(avalue, 
-				(String::Language)(String::L_CLEAN | flang&String::L_OPTIMIZE_BIT));
+				(String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) ));
 	}
 
 	/// appending string, passing language built into string being written
@@ -557,18 +557,10 @@ class Temp_value_element {
 	Request& frequest;
 	Value& fwhere;
 	const String& fname;
-	Value& saved;
+	Value* saved;
 public:
-	Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat) :
-		frequest(arequest),
-		fwhere(awhere),
-		fname(aname),
-		saved(frequest.get_element(awhere, aname)) {
-		frequest.put_element(fwhere, aname, awhat);
-	}
-	~Temp_value_element() { 
-		frequest.put_element(fwhere, fname, &saved);
-	}
+	Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat);
+	~Temp_value_element();
 };
 
 // defines for externs