--- parser3/src/include/pa_request.h	2009/06/16 08:39:00	1.194
+++ parser3/src/include/pa_request.h	2009/07/29 05:01:46	1.196
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char * const IDENT_REQUEST_H="$Date: 2009/06/16 08:39:00 $";
+static const char * const IDENT_REQUEST_H="$Date: 2009/07/29 05:01:46 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -118,7 +118,7 @@ private:
 	///@{ core data
 
 	/// classes
-	HashStringValue fclasses;
+	HashString<Value*> fclasses;
 
 	/// already used files to avoid cyclic uses
 	HashString<bool> used_files;
@@ -152,6 +152,7 @@ public:
 	/// interrupted flag, raised on signals [SIGPIPE]
 	bool finterrupted;
 	Skip fskip;
+	int fin_cycle;
 
 public:
 	uint register_file(String::Body file_spec);
@@ -187,7 +188,7 @@ public:
 	~Request();
 
 	/// global classes
-	HashStringValue& classes() { return fclasses; }
+	HashString<Value*>& classes() { return fclasses; }
 
 	/**
 		core request processing
@@ -311,6 +312,9 @@ public:
 	void set_skip(Skip askip) { fskip=askip; }
 	Skip get_skip() { return fskip; }
 
+	void set_in_cycle(int adelta) { fin_cycle+=adelta; }
+	bool get_in_cycle() { return fin_cycle>0; }
+
 public:
 	
 	/// info from web server
@@ -511,6 +515,17 @@ public:
 	}
 };
 
+///	Auto-object used for break out of cycle check
+class InCycle {
+	Request& frequest;
+public:
+	InCycle(Request& arequest) : frequest(arequest) {
+		frequest.set_in_cycle(1);
+	}
+	~InCycle() { 
+		frequest.set_in_cycle(-1);
+	}
+};
 
 // defines for externs