--- parser3/src/include/pa_request.h 2011/11/23 11:41:07 1.209 +++ parser3/src/include/pa_request.h 2013/08/21 12:11:14 1.212 @@ -1,14 +1,14 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char * const IDENT_REQUEST_H="$Date: 2011/11/23 11:41:07 $"; +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.212 2013/08/21 12:11:14 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -20,14 +20,9 @@ static const char * const IDENT_REQUEST_ #include "pa_sapi.h" #include "pa_vconsole.h" -#ifdef RESOURCES_DEBUG -#include -#endif - // consts const uint ANTI_ENDLESS_EXECUTE_RECOURSION=1000; -const uint ANTI_ENDLESS_JSON_STRING_RECOURSION=100; const size_t pseudo_file_no__process=1; // forwards @@ -132,8 +127,6 @@ private: */ uint anti_endless_execute_recoursion; - uint anti_endless_json_string_recoursion; - ///@} /// execution stack @@ -223,21 +216,6 @@ public: anti_endless_execute_recoursion--; } - uint json_string_recoursion_go_down(){ - if(++anti_endless_json_string_recoursion==ANTI_ENDLESS_JSON_STRING_RECOURSION){ - anti_endless_json_string_recoursion=0; - throw Exception(PARSER_RUNTIME, - 0, - "call canceled - endless json recursion detected"); - } - return anti_endless_json_string_recoursion; - } - - void json_string_recoursion_go_up(){ - if(anti_endless_json_string_recoursion) - anti_endless_json_string_recoursion--; - } - /// void use_file_directly(VStateless_class& aclass, const String& file_spec, @@ -487,7 +465,6 @@ class Request_context_saver { /// execution stack size_t stack; uint anti_endless_execute_recoursion; - uint anti_endless_json_string_recoursion; /// contexts VMethodFrame* method_frame; Value* rcontext; @@ -504,7 +481,6 @@ public: exception_trace_bottom(ar.exception_trace.bottom_index()), stack(ar.stack.top_index()), anti_endless_execute_recoursion(ar.anti_endless_execute_recoursion), - anti_endless_json_string_recoursion(ar.anti_endless_json_string_recoursion), method_frame(ar.method_frame), rcontext(ar.rcontext), wcontext(ar.wcontext), @@ -515,7 +491,6 @@ public: 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.anti_endless_json_string_recoursion=anti_endless_json_string_recoursion; fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext; fr.flang=flang; fr.fconnection=fconnection;