--- parser3/src/include/pa_request.h 2003/02/04 15:59:04 1.160.2.18 +++ parser3/src/include/pa_request.h 2003/02/14 17:33:45 1.160.2.22 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/02/04 15:59:04 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/02/14 17:33:45 $"; #include "pa_pool.h" #include "pa_request_info.h" @@ -67,7 +67,7 @@ class Request: public PA_Object { friend class Temp_request_self; /// all files and classes and other hard-to-place allocations go to this pool - Pool fpool; + Pool& fpool; ///@{ core data @@ -129,7 +129,7 @@ public: double sql_request_time; #endif - Request(SAPI_Info& asapi_info, Request_info& arequest_info, + Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, uchar adefault_lang, ///< all tainted data default untainting lang bool status_allowed ///< status class allowed ); @@ -294,7 +294,7 @@ public: VCookiePtr cookie; /// classes configured data - HashStringValue classes_conf; + HashStringObject classes_conf; public: // status read methods @@ -452,9 +452,15 @@ public: // externs extern StringPtr main_method_name; +extern StringPtr auto_method_name; extern StringPtr body_name; extern StringPtr content_disposition_name; extern StringPtr content_disposition_value; extern StringPtr content_disposition_filename_name; +// defines for statics + +#define MAIN_CLASS_NAME "MAIN" +#define AUTO_FILE_NAME "auto.p" + #endif