--- parser3/src/include/pa_request.h 2003/10/21 04:45:19 1.166 +++ parser3/src/include/pa_request.h 2003/11/19 11:00:33 1.170 @@ -8,8 +8,9 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/10/21 04:45:19 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/11/19 11:00:33 $"; +#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; } @@ -315,7 +318,7 @@ public: VCookie& cookie; /// classes configured data - HashStringObject classes_conf; + Hash classes_conf; public: // status read methods @@ -492,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