--- parser3/src/main/pa_request.C 2001/03/24 19:12:20 1.78 +++ parser3/src/main/pa_request.C 2001/04/02 08:44:57 1.89 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.78 2001/03/24 19:12:20 paf Exp $ + $Id: pa_request.C,v 1.89 2001/04/02 08:44:57 paf Exp $ */ #include "pa_config_includes.h" @@ -17,15 +17,23 @@ #include "pa_vclass.h" #include "_root.h" #include "_table.h" +#include "_file.h" #include "pa_globals.h" #include "pa_vint.h" #include "pa_vmframe.h" #include "pa_types.h" #include "pa_vtable.h" +#include "_random.h" /// $limits.post_max_size default 10M const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; +/// content type of exception response, when no @MAIN:exception handler defined +const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; + +/// content type of response when no $MAIN:defaults.content-type defined +const char *DEFAULT_CONTENT_TYPE="text/html"; + // Request::Request(Pool& apool, Info& ainfo, @@ -40,8 +48,9 @@ Request::Request(Pool& apool, fclasses(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), + used_files(apool), default_content_type(0), - used_files(apool) + mime_types(0) { // root superclass, // parent of all classes, @@ -50,7 +59,10 @@ Request::Request(Pool& apool, classes().put(*root_class_name, &ROOT); // table class classes().put(*table_class_name, table_class); - + // file class + classes().put(*file_class_name, file_class); + // random class + classes().put(*random_class_name, random_class); // env class classes().put(*env_class_name, &env); // form class @@ -97,20 +109,20 @@ void Request::core(const char *root_auto // loading root auto.p if(root_auto_path) { String& filespec=*NEW String(pool()); - filespec.APPEND(root_auto_path, 0, "root_auto", 0); + filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( filespec, root_auto_fail, main_class_name, main_class); } - // $MAIN:limits hash used here, + // $MAIN:LIMITS hash used here, // until someone with less privileges have overriden them { Value *limits=main_class?main_class->get_element(*limits_name):0; // $limits.post_max_size default 10M Value *element=limits?limits->get_element(*post_max_size_name):0; - size_t value=element?(size_t)element->get_double():0; + size_t value=element?(size_t)element->as_double():0; size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT; form.fill_fields(*this, post_max_size); @@ -122,7 +134,7 @@ void Request::core(const char *root_auto // loading site auto.p if(site_auto_path) { String& filespec=*NEW String(pool()); - filespec.APPEND(site_auto_path, 0, "site_auto", 0); + filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( filespec, site_auto_fail, @@ -136,14 +148,17 @@ void Request::core(const char *root_auto /* /document/root */ char *file_spec= (char *)malloc(strlen(info.path_translated)+strlen(AUTO_FILE_NAME)+1); - strcpy(file_spec, info.document_root); + size_t document_root_size=strlen(info.document_root); + if(info.document_root[document_root_size-1]=='/') + document_root_size--; + memcpy(file_spec, info.document_root, document_root_size); /* /requested/file.html */ char *branches=(char *)malloc(strlen(info.path_translated)+1); - strcpy(branches, info.path_translated+strlen(info.document_root)); + strcpy(branches, info.path_translated+document_root_size); char *next=branches; + char *append_here=file_spec+document_root_size; - char *append_here=file_spec+strlen(file_spec); size_t slash_auto_p_size=strlen("/" AUTO_FILE_NAME); while(true) { char *step=lsplit(&next, '/'); @@ -155,7 +170,7 @@ void Request::core(const char *root_auto append_here++/* / */; String& sfile_spec=*NEW String(pool()); - sfile_spec.APPEND(file_spec, 0, "scanned", 0); + sfile_spec.APPEND_CLEAN(file_spec, 0, "scanned", 0); main_class=use_file(sfile_spec, false/*ignore read problem*/, main_class_name, main_class); } else @@ -165,20 +180,23 @@ void Request::core(const char *root_auto // compiling requested file String& spath_translated=*NEW String(pool()); - spath_translated.APPEND(info.path_translated, 0, "user-request", 0); + spath_translated.APPEND_CLEAN(info.path_translated, 0, "user-request", 0); main_class=use_file(spath_translated, true/*don't ignore read problem*/, main_class_name, main_class); - // $MAIN:defaults + // $MAIN:DEFAULTS Value *defaults=main_class->get_element(*defaults_name); // value must be allocated on request's pool for that pool used on // meaning constructing @see attributed_meaning_to_string - default_content_type=defaults? - defaults->get_element(*content_type_name) - :NEW VString(*NEW String(pool(), "text/html")); + default_content_type=defaults?defaults->get_element(*content_type_name):0; if(Value *element=main_class->get_element(*html_typo_name)) - if(VTable *vtable=element->get_vtable()) - pool().set_tag(&vtable->table()); + if(Table *table=element->get_table()) + pool().set_tag(table); + + // $MAIN:MIME-TYPES + if(Value *element=main_class->get_element(*mime_types_name)) + if(Table *table=element->get_table()) + mime_types=table; // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); @@ -187,6 +205,9 @@ void Request::core(const char *root_auto 0, "'"MAIN_METHOD_NAME"' method not found"); + // post-process + // todo + // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); @@ -342,7 +363,7 @@ void Request::core(const char *root_auto // future $response:content-type response.fields().put(*content_type_name, - NEW VString(*NEW String(pool(), "text/plain"))); + NEW VString(*NEW String(pool(), UNHANDLED_EXCEPTION_CONTENT_TYPE))); // future $response:body body_string=NEW String(pool(), buf); } @@ -433,7 +454,9 @@ void Request::output_result(const String cookie.output_result(); // set default content-type - response.fields().put_dont_replace(*content_type_name, default_content_type); + response.fields().put_dont_replace(*content_type_name, + default_content_type?default_content_type + :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, /*excluding*/ body_name);