--- parser3/src/targets/cgi/parser3.C 2020/10/03 22:58:07 1.293 +++ parser3/src/targets/cgi/parser3.C 2020/12/15 20:57:56 1.331 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.293 2020/10/03 22:58:07 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.331 2020/12/15 20:57:56 moko Exp $"; #include "pa_config_includes.h" @@ -15,11 +15,19 @@ volatile const char * IDENT_PARSER3_C="$ #include "pa_request.h" #include "pa_version.h" #include "pa_vconsole.h" +#include "pa_sapi_info.h" #ifdef _MSC_VER #include #include #include + +extern "C" HANDLE WINAPI GC_CreateThread(LPSECURITY_ATTRIBUTES, DWORD, LPTHREAD_START_ROUTINE, LPVOID, DWORD, LPDWORD); + +#else + +extern "C" int GC_pthread_create(pthread_t *, const pthread_attr_t *, void *(*)(void *), void * /* arg */); + #endif // defines @@ -37,29 +45,19 @@ volatile const char * IDENT_PARSER3_C="$ #define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG" #define PARSER_LOG_ENV_NAME "CGI_PARSER_LOG" -/// IIS refuses to read bigger chunks -const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M - -static const char* config_filespec_cstr=0; // -f option -static bool mail_received=false; // -m option? [asked to parse incoming message to $mail:received] - -static int args_skip=1; -static char** argv_all = NULL; - -static bool cgi; ///< we were started as CGI? - -// for signal handlers -Request *request=0; -Request_info *request_info=0; -bool execution_canceled=false; +static const char* filespec_to_process = 0; // [file] +static const char* httpd_host_port = 0; // -p option +static const char* config_filespec = 0; // -f option or from env or next to the executable if exists +static bool mail_received = false; // -m option? [asked to parse incoming message to $mail:received] +static char* parser3_filespec = 0; // argv[0] +static char** argv_extra = NULL; + +// for error logging +static THREAD_LOCAL Request_info request_info; // global for correct log() reporting +static const char* filespec_4log = NULL; // null only if system-wide auto.p used // SAPI -class SAPI_Info { -public: - int http_response_code; -} SAPI_info = { 0 }; - static void log(const char* fmt, va_list args) { bool opened=false; FILE *f=0; @@ -76,12 +74,12 @@ static void log(const char* fmt, va_list opened=f!=0; #endif - if(!opened && config_filespec_cstr) { + if(!opened && filespec_4log) { char beside_config_path[MAX_STRING]; - strncpy(beside_config_path, config_filespec_cstr, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; + strncpy(beside_config_path, filespec_4log, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; if(!(rsplit(beside_config_path, '/') || rsplit(beside_config_path, '\\'))) { // strip filename // no path, just filename - beside_config_path[0]='.'; beside_config_path[1]=0; + strcpy(beside_config_path, "."); } char file_spec[MAX_STRING]; @@ -109,16 +107,10 @@ static void log(const char* fmt, va_list size=remove_crlf(buf, buf+size); fwrite(buf, size, 1, f); - if(request_info) - fprintf(f, " [uri=%s, method=%s, cl=%lu]", - request_info->uri ? request_info->uri : "", - request_info->method ? request_info->method : "", - request_info->content_length); - else - fputs(" [no request info]", f); - - // newline - fputs("\n", f); + if(request_info.method) { + fprintf(f, " [uri=%s, method=%s, cl=%lu]\n", request_info.uri ? request_info.uri : "", request_info.method, (unsigned long)request_info.content_length); + } else + fputs(" [no request info]\n", f); if(opened) fclose(f); @@ -135,7 +127,7 @@ static void log(const char* fmt, ...) { } #endif -// appends to parser3.log located beside my binary if openable, to stderr otherwize +// appends to parser3.log located next to the config file if openable, to stderr otherwize void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); @@ -153,99 +145,60 @@ void SAPI::die(const char* fmt, ...) { // inform user, second vsnprintf va_start(args, fmt); - char body[MAX_STRING]; - int content_length=vsnprintf(body, MAX_STRING, fmt, args); - - // prepare header - // let's be honest, that's bad we couldn't produce valid output - // capitalized headers passed for preventing malloc during capitalization - SAPI::add_header_attribute(SAPI_info, HTTP_STATUS_CAPITALIZED, "500"); - SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain"); - // don't use 'format' function because it calls malloc - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); - SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH_CAPITALIZED, content_length_cstr); - - // send header - SAPI::send_header(SAPI_info); - - // body - SAPI::send_body(SAPI_info, body, content_length); + char message[MAX_STRING]; + vsnprintf(message, MAX_STRING, fmt, args); + SAPI::send_error(*sapiInfo, message); exit(1); // va_end(args); } -char* SAPI::Env::get(SAPI_Info& , const char* name) { - if(char *local=getenv(name)) - return pa_strdup(local); - else - return 0; +char* SAPI::Env::get(SAPI_Info& info, const char* name) { + return info.get_env(name); } -const char* const *SAPI::Env::get(SAPI_Info&) { -#ifdef _MSC_VER - extern char **_environ; - return _environ; -#else - extern char **environ; - return environ; -#endif +bool SAPI::Env::set(SAPI_Info& info, const char* name, const char* value) { + return info.set_env(name, value); } -size_t SAPI::read_post(SAPI_Info& , char *buf, size_t max_bytes) { - size_t read_size=0; - do { - ssize_t chunk_size=read(fileno(stdin), buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); - if(chunk_size<=0) - break; - read_size+=chunk_size; - } while(read_sizeconsole.was_used()) ) - printf("%s: %s\n", capitalize(dont_store_key), dont_store_value); +void SAPI::add_header_attribute(SAPI_Info& info, const char* dont_store_key, const char* dont_store_value) { + info.add_header_attribute(dont_store_key, dont_store_value); } -void SAPI::send_header(SAPI_Info& ) { - if(cgi) { - puts(""); - } +void SAPI::send_header(SAPI_Info& info) { + info.send_header(); } -size_t SAPI::send_body(SAPI_Info& , const void *buf, size_t size) { - return stdout_write(buf, size); +size_t SAPI::send_body(SAPI_Info& info, const void *buf, size_t size) { + return info.send_body(buf, size); } -static void full_file_spec(const char* file_name, char *buf, size_t buf_size) { - if(file_name) - if(file_name[0]=='/' +static void full_disk_path(const char* file_name, char *buf, size_t buf_size) { + if(file_name[0]=='/' #ifdef WIN32 - || file_name[0] && file_name[1]==':' + || file_name[0] && file_name[1]==':' #endif - ){ - strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; - } else { - char cwd[MAX_STRING]; - snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); - } - else - buf[0]=0; + ){ + strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; + } else { + char cwd[MAX_STRING]; + snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); + } #ifdef WIN32 back_slashes_to_slashes(buf); #endif } static void log_signal(const char* signal_name) { - if(request_info) - SAPI::log(SAPI_info, "%s received while %s.", signal_name, request ? "executing code" : "reading data"); - else - SAPI::log(SAPI_info, "%s received before or after processing request", signal_name); + SAPI::log(*sapiInfo, "%s received %s processing request", signal_name, request ? "while" : "before or after"); } #ifdef SIGUSR1 @@ -264,12 +217,36 @@ static void SIGPIPE_handler(int /*sig*/) if(sigpipe && sigpipe->as_bool()) log_signal(SIGPIPE_NAME); - execution_canceled=true; if(request) request->set_skip(Request::SKIP_INTERRUPTED); } #endif +// requires pa_thread_request() in entry_exists() under Windows +static const char *locate_config(const char *config_filespec_option, const char *executable_path){ + filespec_4log=config_filespec_option; + if(!filespec_4log) + filespec_4log=getenv(PARSER_CONFIG_ENV_NAME); + if(!filespec_4log) + filespec_4log=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(!filespec_4log){ + // next to the executable + char *beside_executable_path = pa_strdup(executable_path); + bool stripped_filename = rsplit(beside_executable_path, '/') || rsplit(beside_executable_path, '\\'); + filespec_4log = pa_strcat(stripped_filename ? beside_executable_path : "." /* no path, just filename */ , "/" AUTO_FILE_NAME); + if(entry_exists(filespec_4log)) + return filespec_4log; +#ifdef SYSTEM_CONFIG_FILE + if(entry_exists(SYSTEM_CONFIG_FILE)){ + filespec_4log=NULL; + return SYSTEM_CONFIG_FILE; + } +#endif + return NULL; + } + return filespec_4log; +} + #ifdef WIN32 const char* maybe_reconstruct_IIS_status_in_qs(const char* original) { // 404;http://servername/page[?param=value...] @@ -319,49 +296,152 @@ public: } }; -static bool locate_config(){ - if(!config_filespec_cstr) { - config_filespec_cstr=getenv(PARSER_CONFIG_ENV_NAME); - if(!config_filespec_cstr) - config_filespec_cstr=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); - if(!config_filespec_cstr){ - // beside by binary - char beside_binary_path[MAX_STRING]; - strncpy(beside_binary_path, argv_all[0], 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 - // @todo full path, not ./! - beside_binary_path[0]='.'; beside_binary_path[1]=0; +static void config_handler(SAPI_Info &info) { + char document_root_buf[MAX_STRING]; + full_disk_path("", document_root_buf, sizeof(document_root_buf)); + + request_info.document_root = document_root_buf; + request_info.uri = ""; + request_info.argv = argv_extra; + + // prepare to process request + Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + // only once + config_filespec = locate_config(config_filespec, parser3_filespec); + // process main auto.p only + r.core(config_filespec, false, String::Empty); +} + +static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) { + try { + memset(&request_info, 0, sizeof(request_info)); + + connection.read_header(); + info.populate_env(); + + char document_root_buf[MAX_STRING]; + full_disk_path("", document_root_buf, sizeof(document_root_buf)); + + request_info.document_root = document_root_buf; + request_info.path_translated = filespec_to_process; + request_info.method = connection.method(); + request_info.query_string = connection.query(); + request_info.uri = request_info.strip_absolute_uri(connection.uri()); + request_info.content_type = connection.content_type(); + request_info.content_length = (size_t)connection.content_length(); + request_info.cookie = info.get_env("HTTP_COOKIE"); + request_info.mail_received = false; + request_info.argv = argv_extra; + + // prepare to process request + Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + // process the request + r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); + } catch(const Exception& e) { // exception in connection handling or unhandled exception + SAPI::log(info, "%s", e.comment()); + SAPI::send_error(info, e.comment(), info.exception_http_status(e.type())); + } +} + +#ifdef _MSC_VER +DWORD WINAPI connection_thread(void *arg){ +#else +static void *connection_thread(void *arg){ +#endif + HTTPD_Connection &connection=*(HTTPD_Connection*)arg; + SAPI_Info_HTTPD info(connection); + + try { + connection_handler(info, connection); + } catch(const Exception& e) { // exception in send_error + SAPI::log(*sapiInfo, "%s", e.comment()); + } + + delete(&connection); + return 0; +} + +static void httpd_mode() { + config_handler(*sapiInfo); + + int sock = HTTPD_Server::bind(httpd_host_port); + +#ifdef SIGCHLD + signal(SIGCHLD, SIG_IGN); +#endif +#ifdef SIGPIPE + signal(SIGPIPE, SIG_IGN); +#endif + + while(1){ +#ifndef _MSC_VER + pid_t pid=1; +#endif + try { + request_info.method=NULL; // wipe previous request for correct logging + HTTPD_Connection connection; + if(!connection.accept(sock, 5)) + continue; + + switch (HTTPD_Server::mode) { + case HTTPD_Server::MULTITHREADED: +#ifdef _MSC_VER + if (!GC_CreateThread(0, 0, connection_thread, new HTTPD_Connection(connection), 0, 0)) + throw Exception("httpd.fork", 0, "thread creation failed"); + connection.sock = -1; + break; +#else + pthread_t thread; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + + if(int result=GC_pthread_create(&thread, &attr, connection_thread, new HTTPD_Connection(connection))) + throw Exception("httpd.fork", 0, "thread creation failed (%d)", result); + connection.sock=-1; + break; + case HTTPD_Server::PARALLEL: + pid=fork(); + if(pid<0) + throw Exception("httpd.fork", 0, "fork failed: %s (%d)", strerror(errno), errno); + if(pid>0) + continue; // parent should close connection.sock as well +#endif + case HTTPD_Server::SEQUENTIAL: // and fork child + + SAPI_Info_HTTPD info(connection); + connection_handler(info, connection); } - char config_filespec_buf[MAX_STRING]; - snprintf(config_filespec_buf, MAX_STRING, "%s/%s", beside_binary_path, AUTO_FILE_NAME); - config_filespec_cstr=pa_strdup(config_filespec_buf); - return entry_exists(config_filespec_cstr); + // closing connection socket in HTTPD_Connection destructor + } catch(const Exception& e) { // exception in accept or send_error + SAPI::log(*sapiInfo, "%s", e.comment()); } + +#ifndef _MSC_VER + if(pid==0) // fork child + exit(0); +#endif } - return true; } -/** -main workhorse - - @todo - IIS: remove trailing default-document[index.html] from $request.uri. - to do that we need to consult metabase, - wich is tested but seems slow. -*/ -static void real_parser_handler(const char* filespec_to_process, const char* request_method, bool header_only) { +/** main workhorse */ +static void real_parser_handler(bool cgi) { // init libraries pa_globals_init(); - - if(!filespec_to_process || !*filespec_to_process) + + if(httpd_host_port){ + httpd_mode(); + } + + const char* request_method=getenv("REQUEST_METHOD"); + + if(!filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); - // Request info - Request_info request_info; memset(&request_info, 0, sizeof(request_info)); char document_root_buf[MAX_STRING]; + // global request info request_info.path_translated = filespec_to_process; request_info.method = request_method ? request_method : "GET"; request_info.query_string = MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(getenv("QUERY_STRING")); @@ -408,56 +488,33 @@ static void real_parser_handler(const ch if(strncmp(request_info.uri, script_name, script_name_len)==0 && script_name_len != uri_len) // under IIS they are the same SAPI::die("CGI: illegal call (1)"); } else { // fcgiwrap minimalistic setup - - if(request_info.query_string && *request_info.query_string) { - char* reconstructed_uri = new(PointerFreeGC) char[strlen(path_info) + 1/*'?'*/+ strlen(request_info.query_string) + 1/*0*/]; - strcpy(reconstructed_uri, path_info); - strcat(reconstructed_uri, "?"); - strcat(reconstructed_uri, request_info.query_string); - request_info.uri = reconstructed_uri; - } else - request_info.uri = path_info; + request_info.uri = request_info.query_string && *request_info.query_string ? pa_strcat(path_info, "?", request_info.query_string) : path_info; } } else{ - full_file_spec("", document_root_buf, sizeof(document_root_buf)); + full_disk_path("", document_root_buf, sizeof(document_root_buf)); request_info.document_root = document_root_buf; request_info.uri = ""; } request_info.content_type = getenv("CONTENT_TYPE"); - const char* content_length = getenv("CONTENT_LENGTH"); - request_info.content_length = content_length ? atoi(content_length) : 0; + request_info.content_length = (size_t)pa_atoul(getenv("CONTENT_LENGTH")); request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; - request_info.argv = argv_all; - request_info.args_skip = args_skip; - - // get request_info ptr for signal handlers - ::request_info = &request_info; - if(execution_canceled) - SAPI::die("Execution canceled"); + request_info.argv = argv_extra; #ifdef PA_DEBUG_CGI_ENTRY_EXIT - log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s, cookies=%s, cl=%u", - request_info.method, - request_info.uri, - request_info.query_string, - request_info.document_root, - request_info.path_translated, - request_info.cookie, - request_info.content_length); + log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s", request_info.method, request_info.uri, request_info.query_string, request_info.document_root, request_info.path_translated); #endif // prepare to process request - Request request(SAPI_info, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); + Request r(*sapiInfo, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); { - // get ::request ptr for signal handlers - RequestController rc(&request); - bool fail_on_config_read_problem=locate_config(); + // initing ::request ptr for signal handlers + RequestController rc(&r); // process the request - request.core(config_filespec_cstr, fail_on_config_read_problem, header_only); - // ::request cleared in RequestController desctructor to prevent signal handlers from accessing invalid memory + r.core(locate_config(config_filespec, parser3_filespec), strcasecmp(request_info.method, "HEAD")==0); + // clearing ::request in RequestController destructor to prevent signal handlers from accessing invalid memory } // finalize libraries @@ -465,9 +522,9 @@ static void real_parser_handler(const ch } #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION -static const Exception call_real_parser_handler__do_PEH_return_it(const char* filespec_to_process, const char* request_method, bool header_only) { +static const Exception call_real_parser_handler__do_PEH_return_it(bool cgi) { try { - real_parser_handler(filespec_to_process, request_method, header_only); + real_parser_handler(cgi); } catch(const Exception& e) { return e; } @@ -475,12 +532,12 @@ static const Exception call_real_parser_ return Exception(); } -static void call_real_parser_handler__supress_system_exception(const char* filespec_to_process, const char* request_method, bool header_only) { +static void call_real_parser_handler__supress_system_exception(bool cgi) { Exception parser_exception; LPEXCEPTION_POINTERS system_exception=0; __try { - parser_exception=call_real_parser_handler__do_PEH_return_it(filespec_to_process, request_method, header_only); + parser_exception=call_real_parser_handler__do_PEH_return_it(cgi); } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) @@ -503,46 +560,46 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" - "Usage: %s [options] file\n" + "Usage: %s [options] [file]\n" "Options are:\n" #ifdef WITH_MAILRECEIVE " -m Parse mail, put received letter to $mail:received\n" #endif " -f config_file Use this config file (/path/to/auto.p)\n" + " -p [host:]port Start web server on this port\n" " -h Display usage information (this message)\n", PARSER_VERSION, program); exit(EINVAL); } + int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: entry"); #endif + parser3_filespec = argv[0]; + umask(2); + + // were we started as CGI? + bool cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); + sapiInfo = cgi ? new SAPI_Info_CGI() : new SAPI_Info(); + #ifdef SIGUSR1 - if(signal(SIGUSR1, SIGUSR1_handler)==SIG_ERR) - SAPI::die("Can not set handler for SIGUSR1"); + signal(SIGUSR1, SIGUSR1_handler); #endif #ifdef SIGPIPE - if(signal(SIGPIPE, SIGPIPE_handler)==SIG_ERR) - SAPI::die("Can not set handler for SIGPIPE"); + signal(SIGPIPE, SIGPIPE_handler); #endif - argv_all=argv; - umask(2); - - // were we started as CGI? - cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); - - char *raw_filespec_to_process; + char *raw_filespec_to_process = NULL; if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); - if(raw_filespec_to_process && !*raw_filespec_to_process) - raw_filespec_to_process=0; + argv_extra=argv + 1; } else { int optind=1; while(optind < argc){ @@ -559,7 +616,13 @@ int main(int argc, char *argv[]) { case 'f': if(optind < argc - 1){ optind++; - config_filespec_cstr=argv[optind]; + config_filespec=argv[optind]; + } + break; + case 'p': + if(optind < argc - 1){ + optind++; + httpd_host_port=argv[optind]; } break; #ifdef WITH_MAILRECEIVE @@ -577,11 +640,20 @@ int main(int argc, char *argv[]) { } if (optind > argc - 1) { - fprintf(stderr, "%s: file not specified\n", argv[0]); - usage(argv[0]); + if(!httpd_host_port) { + fprintf(stderr, "%s: file not specified\n", argv[0]); + usage(argv[0]); + } + } else { + raw_filespec_to_process=argv[optind]; + } + + if (httpd_host_port && mail_received) { + fprintf(stderr, "%s: -p and -m options should not be used together\n", argv[0]); + usage(argv[0]); } - raw_filespec_to_process=argv[optind]; - args_skip=optind; + + argv_extra=argv + optind; } #ifdef _MSC_VER @@ -604,20 +676,20 @@ int main(int argc, char *argv[]) { _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); #endif - 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; - try { // global try - REAL_PARSER_HANDLER(filespec_to_process, request_method, header_only); + char filespec_to_process_buf[MAX_STRING]; + if(raw_filespec_to_process && *raw_filespec_to_process){ + full_disk_path(raw_filespec_to_process, filespec_to_process_buf, sizeof(filespec_to_process_buf)); + filespec_to_process=filespec_to_process_buf; + } + + REAL_PARSER_HANDLER(cgi); } catch(const Exception& e) { // exception in unhandled exception - SAPI::die("Unhandled exception %s", e.comment()); + SAPI::die("%s", e.comment()); } #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: successful return"); #endif - return SAPI_info.http_response_code < 100 ? SAPI_info.http_response_code : 0; + return sapiInfo->http_response_code < 100 ? sapiInfo->http_response_code : 0; }