--- parser3/src/targets/cgi/parser3.C 2002/01/31 10:20:21 1.151 +++ parser3/src/targets/cgi/parser3.C 2002/06/12 14:18:05 1.182 @@ -1,10 +1,10 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: parser3.C,v 1.151 2002/01/31 10:20:21 paf Exp $ + $Id: parser3.C,v 1.182 2002/06/12 14:18:05 paf Exp $ */ #include "pa_config_includes.h" @@ -12,8 +12,6 @@ #if _MSC_VER # include # include -#else -# include "pa_config_paths.h" #endif #include "pa_sapi.h" @@ -29,9 +27,19 @@ #endif //#define DEBUG_POOL_MALLOC +//#define DEBUG_STRING_APPENDS_VS_EXPANDS + +#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS +extern ulong + string_piece_appends, + wcontext_result_size, + total_alloc_size, + string_string_shortcut_economy; +#endif // consts +#ifndef _PROFILE extern const char *main_RCSIds[]; #ifdef USE_SMTP extern const char *smtp_RCSIds[]; @@ -51,13 +59,16 @@ const char **RCSIds[]={ parser3_RCSIds, 0 }; +#endif + +#define REDIRECT_PREFIX "REDIRECT_" +#define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG" /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M const char *argv0; -Pool_storage pool_storage; -Pool pool(&pool_storage); // global pool [dont describe to doxygen: it confuses it with param names] +Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] bool cgi; ///< we were started as CGI? // SAPI @@ -80,8 +91,10 @@ static void log(const char *fmt, va_list // prefix time_t t=time(0); - const char *stamp=ctime(&t); - fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp); + if(const char *stamp=ctime(&t)) { // never saw that + if(size_t len=strlen(stamp)) // saw once stamp being ="" + fprintf(f, "[%.*s] ", len-1, stamp); + } // message char buf[MAX_STRING]; @@ -109,7 +122,7 @@ void SAPI::log(Pool& , const char *fmt, void SAPI::die(const char *fmt, ...) { #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); - log_pool_stats(pool); + log_pool_stats(*pool); #endif va_list args; @@ -130,17 +143,17 @@ void SAPI::die(const char *fmt, ...) { // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(pool, "status", "500"); - SAPI::add_header_attribute(pool, "content-type", "text/plain"); + SAPI::add_header_attribute(*pool, "status", "500"); + SAPI::add_header_attribute(*pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); - SAPI::add_header_attribute(pool, "content-length", content_length_cstr); + snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); + SAPI::add_header_attribute(*pool, "content-length", content_length_cstr); // send header - SAPI::send_header(pool); + SAPI::send_header(*pool); // body - SAPI::send_body(pool, body, content_length); + SAPI::send_body(*pool, body, content_length); exit(1); } @@ -149,6 +162,16 @@ const char *SAPI::get_env(Pool& , const return getenv(name); } +const char *const *SAPI::environment(Pool&) { +#ifdef _MSC_VER + extern char **_environ; + return _environ; +#else + extern char **environ; + return environ; +#endif +} + size_t SAPI::read_post(Pool& , char *buf, size_t max_bytes) { size_t read_size=0; do { @@ -183,14 +206,23 @@ void SAPI::send_body(Pool& , const void // -char *full_file_spec(char *file_name) { - if(file_name && !strchr(file_name, '/')) { - static char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); - static char buf[MAX_STRING]; - snprintf(buf, MAX_STRING, "%s/%s", cwd, file_name); - return buf; - } - return file_name; +void full_file_spec(const char *file_name, char *buf, size_t buf_size) { + if(file_name) + if(file_name[0]=='/' +#ifdef WIN32 + || (file_name[0] && file_name[1]==':') +#endif + ) + strncpy(buf, file_name, buf_size); + else { + char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); + snprintf(buf, buf_size, "%s/%s", cwd, file_name); + } + else + buf[0]=0; +#ifdef WIN32 + back_slashes_to_slashes(buf); +#endif } /** @@ -206,49 +238,45 @@ void real_parser_handler( const char *filespec_to_process, const char *request_method, bool header_only) { // init socks - init_socks(pool); + init_socks(*pool); // init global classes - init_methoded_array(pool); + init_methoded_array(*pool); // init global variables - pa_globals_init(pool); + pa_globals_init(*pool); if(!filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); // Request info Request::Info request_info; + char document_root_buf[MAX_STRING]; if(cgi) { - if(const char *env_document_root=SAPI::get_env(pool, "DOCUMENT_ROOT")) + if(const char *env_document_root=SAPI::get_env(*pool, "DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) { + else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) { // IIS - size_t len=strlen(filespec_to_process)-strlen(path_info); - char *buf=(char *)pool.malloc(len+1); - memcpy(buf, filespec_to_process, len); buf[len]=0; - request_info.document_root=buf; + size_t len=min(sizeof(document_root_buf)-1, strlen(filespec_to_process)-strlen(path_info)); + memcpy(document_root_buf, filespec_to_process, len); document_root_buf[len]=0; + request_info.document_root=document_root_buf; } else - throw Exception(0, 0, - 0, - "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); + throw Exception("parser.runtime", + 0, + "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); } else { - static char buf[MAX_STRING]; - strncpy(buf, filespec_to_process, MAX_STRING-1); buf[MAX_STRING-1]=0; - if(rsplit(buf, '/') || rsplit(buf, '\\')) // strip filename - request_info.document_root=buf; - else - request_info.document_root=""; + full_file_spec("", document_root_buf, sizeof(document_root_buf)); + request_info.document_root=document_root_buf; } request_info.path_translated=filespec_to_process; request_info.method=request_method ? request_method : "GET"; - const char *query_string=SAPI::get_env(pool, "QUERY_STRING"); + const char *query_string=SAPI::get_env(*pool, "QUERY_STRING"); request_info.query_string=query_string; if(cgi) { - if(const char *env_request_uri=SAPI::get_env(pool, "REQUEST_URI")) + if(const char *env_request_uri=SAPI::get_env(*pool, "REQUEST_URI")) request_info.uri=env_request_uri; - else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) + else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) if(query_string) { - char *reconstructed_uri=(char *)pool.malloc( + char *reconstructed_uri=(char *)pool->malloc( strlen(path_info)+1/*'?'*/+ strlen(query_string)+1/*0*/); strcpy(reconstructed_uri, path_info); @@ -257,14 +285,14 @@ void real_parser_handler( request_info.uri=reconstructed_uri; } else request_info.uri=path_info; - else - throw Exception(0, 0, + else + throw Exception("parser.runtime", 0, "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); #ifndef WIN32 // they've changed this under IIS5. - if(const char *script_name=SAPI::get_env(pool, "SCRIPT_NAME")) { + if(const char *script_name=SAPI::get_env(*pool, "SCRIPT_NAME")) { size_t script_name_len=strlen(script_name); size_t uri_len=strlen(request_info.uri); if(strncmp(request_info.uri,script_name, script_name_len)==0 && @@ -273,16 +301,15 @@ void real_parser_handler( } #endif } else - request_info.uri=0; + request_info.uri=""; - request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE"); - const char *content_length=SAPI::get_env(pool, "CONTENT_LENGTH"); + request_info.content_type=SAPI::get_env(*pool, "CONTENT_TYPE"); + const char *content_length=SAPI::get_env(*pool, "CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); - request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE"); - request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT"); + request_info.cookie=SAPI::get_env(*pool, "HTTP_COOKIE"); // prepare to process request - Request request(pool, + Request request(*pool, request_info, #ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT @@ -292,44 +319,33 @@ void real_parser_handler( , true /* status_allowed */); - // some root-controlled location -#ifdef PARSER_ROOT_CONFIG_DIR - const char *root_config_filespec=PARSER_ROOT_CONFIG_DIR "/" CONFIG_FILE_NAME; -#else -# ifdef WIN32 - // c:\windows - char root_config_path[MAX_STRING]; - GetWindowsDirectory(root_config_path, MAX_STRING); - - char root_config_filespec[MAX_STRING]; - snprintf(root_config_filespec, MAX_STRING, - "%s/%s", - root_config_path, CONFIG_FILE_NAME); -# else -#error must be compiled either configure/make or MSVC++ -# endif -#endif - + const char *config_filespec_cstr; + char config_filespec_buf[MAX_STRING]; + const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); + if(!config_by_env) + config_by_env=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(config_by_env) + config_filespec_cstr=config_by_env; + else { // beside by binary // @todo full path, not ./! - static char site_config_path[MAX_STRING]; - strncpy(site_config_path, argv0, MAX_STRING-1); site_config_path[MAX_STRING-1]=0; // filespec of my binary - if(!( - rsplit(site_config_path, '/') || - rsplit(site_config_path, '\\'))) { // strip filename - // no path, just filename - site_config_path[0]='.'; site_config_path[1]=0; + char beside_binary_path[MAX_STRING]; + strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary + if(!( + rsplit(beside_binary_path, '/') || + rsplit(beside_binary_path, '\\'))) { // strip filename + // no path, just filename + beside_binary_path[0]='.'; beside_binary_path[1]=0; + } + snprintf(config_filespec_buf, MAX_STRING, + "%s/%s", + beside_binary_path, CONFIG_FILE_NAME); + config_filespec_cstr=config_filespec_buf; } - char site_config_filespec[MAX_STRING]; - snprintf(site_config_filespec, MAX_STRING, - "%s/%s", - site_config_path, CONFIG_FILE_NAME); - // process the request request.core( - root_config_filespec, false, - site_config_filespec, false, + config_filespec_cstr, false /*fail_on_read_problem*/, header_only); // @@ -337,8 +353,18 @@ void real_parser_handler( #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); - log_pool_stats(pool); + log_pool_stats(*pool); #endif + +#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS + SAPI::log(*pool, + "string piece appends=%lu, wcontext_result_size=%lu, string_string_shortcut_economy_closer=%lu, total_alloc_size=%lu", + string_piece_appends, + wcontext_result_size, + string_string_shortcut_economy, + total_alloc_size); +#endif + } void call_real_parser_handler__do_SEH( @@ -359,13 +385,13 @@ void call_real_parser_handler__do_SEH( if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception(0, 0, - 0, - "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + throw Exception(0, + 0, + "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); else - throw Exception(0, 0, 0, "Exception "); + throw Exception(0, 0, "Exception "); else - throw Exception(0, 0, 0, "Exception "); + throw Exception(0, 0, "Exception "); } #endif } @@ -384,6 +410,13 @@ void failed_new() { #endif int main(int argc, char *argv[]) { + Pool_storage global_pool_storage; + Pool global_pool(&global_pool_storage); + pool=&global_pool; + +#ifdef _DEBUG +// _crtBreakAlloc=33112; +#endif // _asm int 3; argv0=argv[0]; @@ -399,8 +432,8 @@ int main(int argc, char *argv[]) { if(!cgi) { if(argc<2) { printf( - "Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)\n" - "Author: Alexander Petrosyan (http://paf.design.ru)\n" + "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" + "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s \n", PARSER_VERSION, @@ -437,11 +470,9 @@ int main(int argc, char *argv[]) { std::set_new_handler(failed_new); #endif - char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; -#ifdef WIN32 - back_slashes_to_slashes(filespec_to_process); -#endif - filespec_to_process=full_file_spec(filespec_to_process); + char *raw_filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; + char filespec_to_process[MAX_STRING]; + full_file_spec(raw_filespec_to_process, filespec_to_process, sizeof(filespec_to_process)); const char *request_method=getenv("REQUEST_METHOD"); bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; @@ -466,7 +497,8 @@ int main(int argc, char *argv[]) { #ifndef WIN32 // if(!cgi) - SAPI::send_body(pool, "\n", 1); + SAPI::send_body(*pool, "\n", 1); #endif +//_asm int 3; return 0; }