--- parser3/src/include/pa_request.h	2003/10/02 07:26:46	1.165
+++ parser3/src/include/pa_request.h	2003/11/20 16:34:25	1.172
@@ -8,8 +8,9 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/10/02 07:26:46 $";
+static const char * const IDENT_REQUEST_H="$Date: 2003/11/20 16:34:25 $";
 
+#include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
 #include "pa_value.h"
@@ -63,6 +64,10 @@ public:
 		const Operation::Origin origin() const { return forigin; }
 	};
 
+private:
+	Pool fpool;
+public:
+	Pool& pool() { return fpool; }
 
 private:
 	union StackItem {
@@ -72,9 +77,7 @@ private:
 	public:
 		Value& value() const { return *fvalue; }
 		const String& string() const { 
-			const String* result=fvalue->get_string();
-			assert(result);
-			return *result; 
+			return fvalue->as_string();
 		}
 		ArrayOperation& ops() const { return *fops; }
 		VMethodFrame& method_frame() const { return *fmethod_frame; }
@@ -154,9 +157,7 @@ public:
 		Exception_details(
 			const Trace atrace,
 			const String* aproblem_source,
-			VHash& avhash):
-			trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
-
+			VHash& avhash): trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
 	};
 	Exception_details get_details(const Exception& e);
 
@@ -317,7 +318,7 @@ public:
 	VCookie& cookie;
 
 	/// classes configured data
-	HashStringObject classes_conf;
+	Hash<const String::Body, void*> classes_conf;
 
 public: // status read methods
 
@@ -427,6 +428,7 @@ class Request_context_saver {
 	size_t exception_trace_bottom;
 	/// execution stack
 	size_t stack;
+	uint anti_endless_execute_recoursion;
 	/// contexts
 	VMethodFrame* method_frame;
 	Value* rcontext;
@@ -438,19 +440,21 @@ class Request_context_saver {
 
 public:
 	Request_context_saver(Request& ar) : 
+		fr(ar),
 		exception_trace_top(ar.exception_trace.top_index()),	
 		exception_trace_bottom(ar.exception_trace.bottom_index()),	
 		stack(ar.stack.top_index()),
+		anti_endless_execute_recoursion(ar.anti_endless_execute_recoursion),
 		method_frame(ar.method_frame),
 		rcontext(ar.rcontext),
 		wcontext(ar.wcontext),
 		flang(ar.flang),
-		fconnection(ar.fconnection),
-		fr(ar) {}
+		fconnection(ar.fconnection) {}
 	void restore() {
 		fr.exception_trace.set_top_index(exception_trace_top);
 		fr.exception_trace.set_bottom_index(exception_trace_bottom);
 		fr.stack.set_top_index(stack);
+		fr.anti_endless_execute_recoursion=anti_endless_execute_recoursion;
 		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
 		fr.flang=flang;
 		fr.fconnection=fconnection;
@@ -491,6 +495,8 @@ public:
 #define CONTENT_DISPOSITION_NAME "content-disposition"
 #define CONTENT_DISPOSITION_VALUE "attachment"
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
+#define EXCEPTION_HANDLED_PART_NAME "handled"
+
 
 // externs