--- parser3/src/targets/cgi/parser3.C 2024/12/06 00:40:12 1.365 +++ parser3/src/targets/cgi/parser3.C 2026/09/29 02:56:52 1.372 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.365 2024/12/06 00:40:12 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.372 2026/09/29 02:56:52 moko Exp $"; #include "pa_config_includes.h" @@ -65,46 +65,39 @@ static char** argv_extra = NULL; static THREAD_LOCAL Request_info *request_info_4log = NULL; // global for correct log() reporting static const char* filespec_4log = NULL; // null only if system-wide auto.p used -template static T *dir_pos(T *fname){ - T *result=NULL; - while (fname=strpbrk(fname, "/\\")){ - result=fname; - fname++; - } - return result; -} - -// SAPI - -static void pa_log(const char* fmt, va_list args) { - FILE *f=0; +const char *parser3_log_filespec() { // $status:log-filename const char* slog=log_filespec; if(!slog) slog=getenv(PARSER_LOG_ENV_NAME); if(!slog) slog=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME); - - if(slog) { - f=strcmp(slog,"-") ? fopen(slog, "at") : stderr; - } else if(filespec_4log) { - char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; + if(!slog) { + static char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; pa_strncpy(log_spec, filespec_4log, MAX_STRING); - if(char* log_dir_pos=dir_pos(log_spec)){ + if(char* log_dir_pos=strrpbrk(log_spec, "/\\")){ strcpy(log_dir_pos, "/parser3.log"); } else { // no path, just filename strcpy(log_spec, "./parser3.log"); } - f=fopen(log_spec, "at"); + slog=log_spec; } + return slog; +} + +// SAPI + +static void pa_log(const char* fmt, va_list args) { + // use no memory [so that we could log out-of-memory error] + const char* slog=parser3_log_filespec(); + FILE *f=strcmp(slog,"-") ? fopen(slog, "at") : stderr; // fallback to stderr if(!f) f=stderr; - // use no memory [so that we could log out-of-memory error] setbuf(f, 0); // stderr stream is unbuffered by default, but still... // prefix @@ -113,8 +106,8 @@ static void pa_log(const char* fmt, va_l if(size_t len=strlen(stamp)) // saw once stamp being ="" fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)pa_get_thread_id() ); } - // message + // message char buf[MAX_LOG_STRING]; size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); size=remove_crlf(buf, buf+size); @@ -202,11 +195,7 @@ size_t SAPI::send_body(SAPI_Info& info, static const char* full_disk_path(const char* file_name = "") { char* result; - if(file_name[0]=='/' -#ifdef WIN32 - || file_name[0] && file_name[1]==':' -#endif - ){ + if(file_name[0]=='/' || is_os_absolute_path(file_name)){ result=pa_strdup(file_name); } else { char cwd[MAX_STRING]; @@ -245,7 +234,7 @@ static const char* locate_config(const c if(!filespec_4log) filespec_4log=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); if(!filespec_4log){ - const char* exec_dir_pos = dir_pos(executable_path); + const char* exec_dir_pos = strrpbrk(executable_path, "/\\"); #ifdef SYSTEM_CONFIG_FILE if(exec_dir_pos){ #endif @@ -485,9 +474,11 @@ static void real_parser_handler(bool cgi const char* request_method=getenv("REQUEST_METHOD"); - if(!filespec_to_process) - SAPI::die("Parser/%s", PARSER_VERSION); - + if(!filespec_to_process){ + SAPI::send_error(*sapi_info, "Parser/" PARSER_VERSION); + exit(1); + } + // global request info Request_info request_info; RequestInfoController ric(&request_info, sapi_info); @@ -513,6 +504,7 @@ static void real_parser_handler(bool cgi memcpy(document_root, filespec_to_process, prefix_len); document_root[prefix_len] = 0; request_info.document_root = document_root; } + request_info.document_root = MAYBE_BACK_SLASHES_TO_SLASHES(request_info.document_root); request_info.uri = request_info.strip_absolute_uri(getenv("REQUEST_URI")); if(request_info.uri) { // apache & others stuck to standards @@ -590,7 +582,7 @@ static void call_real_parser_handler__su } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception("system", 0, "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + throw Exception("system", 0, "0x%08X at %p", er->ExceptionCode, er->ExceptionAddress); else throw Exception("system", 0, ""); else @@ -613,7 +605,7 @@ static void usage(const char* message=NU printf( "Parser/%s\n" - "Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)\n" "Authors: Konstantin Morshnev , Alexandr Petrosian \n" "\n" "Usage: %s [options] [file]\n"