--- parser3/src/include/pa_request.h 2001/03/13 17:54:13 1.50 +++ parser3/src/include/pa_request.h 2001/03/14 16:47:29 1.53 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.h,v 1.50 2001/03/13 17:54:13 paf Exp $ + $Id: pa_request.h,v 1.53 2001/03/14 16:47:29 paf Exp $ */ #ifndef PA_REQUEST_H @@ -42,11 +42,19 @@ class Request : public Pooled { friend Temp_lang; public: + struct Info { + const char *document_root; + const char *path_translated; + const char *request_method; + const char *query_string; + const char *request_uri; + const char *content_type; + size_t content_length; + }; + Request(Pool& apool, - String::Untaint_lang alang, - - char *adocument_root, - char *apage_filespec + Info& ainfo, + String::Untaint_lang alang ); ~Request() {} @@ -54,7 +62,9 @@ public: Hash& classes() { return fclasses; } // core request processing - char *core(bool& error); + char *core( + const char *sys_auto_path1, + const char *sys_auto_path2); void execute(const Array& ops); @@ -99,6 +109,9 @@ public: public: + // + Info& info; + // default base VClass root_class; // $env:fields here @@ -124,8 +137,8 @@ private: // compile.C private: // execute.C - char *execute_method(Value& aself, const Method& method, bool return_cstr); - char *execute_method(Value& aself, const String& method_name, bool return_cstr); + char *execute_method(Value& aself, const Method& method, bool return_cstr=true); + char *execute_method(Value& aself, const String& method_name, bool return_cstr=true); Value *get_element();