--- parser3/src/include/pa_request.h 2010/08/30 10:49:05 1.204 +++ 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: 2010/08/30 10:49:05 $"; +#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,10 +20,6 @@ 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; @@ -183,8 +179,7 @@ public: #endif Request(SAPI_Info& asapi_info, Request_info& arequest_info, - String::Language adefault_lang, ///< all tainted data default untainting lang - bool status_allowed ///< status class allowed + String::Language adefault_lang ///< all tainted data default untainting lang ); ~Request(); @@ -302,6 +297,9 @@ public: /// returns an absolute @a path to relative @a name const String& absolute(const String& relative_name); + /// returns the mime type of 'user_file_name' + const String& mime_type_of(const String* file_name); + /// returns the mime type of 'user_file_name_cstr' const String& mime_type_of(const char* user_file_name_cstr); @@ -365,6 +363,9 @@ public: // status read methods } */ + /// public for ^reflection:copy[] + void put_element(Value& ncontext, const String& name, Value* value); + /// for @main[] const String* execute_virtual_method(Value& aself, const String& method_name); @@ -416,7 +417,6 @@ private: // compile.C private: // execute.C - void put_element(Value& ncontext, const String& name, Value* value); Value& get_element(Value& ncontext, const String& name); private: // defaults