--- parser3/src/targets/cgi/parser3.C 2002/11/20 13:37:23 1.201 +++ parser3/src/targets/cgi/parser3.C 2007/08/17 08:16:11 1.243 @@ -1,16 +1,15 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2002/11/20 13:37:23 $"; +static const char * const IDENT_PARSER3_C="$Date: 2007/08/17 08:16:11 $"; #include "pa_config_includes.h" #if _MSC_VER -# include # include #endif @@ -20,7 +19,6 @@ static const char* IDENT_PARSER3_C="$Dat #include "pa_request.h" #include "pa_socks.h" #include "pa_version.h" -#include "pool_storage.h" #ifdef WIN32 # include @@ -29,45 +27,59 @@ static const char* IDENT_PARSER3_C="$Dat # include #endif -//#define DEBUG_POOL_MALLOC -//#define DEBUG_STRING_APPENDS_VS_EXPANDS -//#define DEBUG_MAILRECEIVE "mailreceive.eml" +// defines + +// comment remove me after debugging +//#define PA_DEBUG_CGI_ENTRY_EXIT "c:\\parser\\debug-parser3.log" -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS -extern ulong - string_piece_appends, - wcontext_result_size, - total_alloc_size, - string_string_shortcut_economy; +#if _MSC_VER && !defined(_DEBUG) +# define PA_SUPPRESS_SYSTEM_EXCEPTION #endif +//#define DEBUG_MAILRECEIVE "mailreceive.eml" + // consts #define REDIRECT_PREFIX "REDIRECT_" #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 *argv0; -static const char *config_filespec_cstr=0; +static const char* argv0; +static const char* config_filespec_cstr=0; static bool fail_on_config_read_problem=true; -static Pool_storage global_pool_storage; ///< global pool storage -static Pool global_pool(&global_pool_storage); ///< global pool static bool cgi; ///< we were started as CGI? static bool mail_received=false; ///< we were started with -m option? [asked to parse incoming message to $mail:received] // for signal handlers Request *request=0; +Request_info *request_info=0; +bool execution_canceled=false; // SAPI -static void log(const char *fmt, va_list args) { +class SAPI_Info{} SAPI_info; + +static void log(const char* fmt, va_list args) { bool opened=false; FILE *f=0; - if(config_filespec_cstr) { + const char* log_by_env=getenv(PARSER_LOG_ENV_NAME); + if(!log_by_env) + log_by_env=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME); + if(log_by_env) { + f=fopen(log_by_env, "at"); + opened=f!=0; + } +#ifdef PA_DEBUG_CGI_ENTRY_EXIT + f=fopen(PA_DEBUG_CGI_ENTRY_EXIT, "at"); + opened=f!=0; +#endif + + if(!opened && config_filespec_cstr) { char beside_config_path[MAX_STRING]; strncpy(beside_config_path, config_filespec_cstr, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; if(!( @@ -87,48 +99,62 @@ static void log(const char *fmt, va_list if(!opened) 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 time_t t=time(0); - if(const char *stamp=ctime(&t)) { // never saw that + 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); + fprintf(f, "[%.*s] [%u] ", len-1, stamp, + (unsigned int)getpid() + ); } // message char buf[MAX_STRING]; size_t size=vsnprintf(buf, MAX_STRING, fmt, args); remove_crlf(buf, buf+size); - fwrite(buf, size, 1, f); + + if(request_info) + fprintf(f, " [uri=%s, method=%s, cl=%u]", + request_info->uri? request_info->uri: "", + request_info->method? request_info->method: "", + request_info->content_length); + else + fputs(" [no request info]", f); + // newline - fprintf(f, "\n"); + fputs("\n", f); if(opened) fclose(f); else fflush(f); } - -// appends to parser3.log located beside my binary if openable, to stderr otherwize -void SAPI::log(Pool& , const char *fmt, ...) { +#ifdef PA_DEBUG_CGI_ENTRY_EXIT +static void log(const char* fmt, ...) { va_list args; va_start(args,fmt); - ::log(fmt, args); + log(fmt, args); va_end(args); } - -void SAPI::die(const char *fmt, ...) { -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(Pool& pool); - log_pool_stats(global_pool); #endif +// appends to parser3.log located beside my binary if openable, to stderr otherwize +void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); + ::log(fmt, args); + va_end(args); +} + +static void die_or_abort(const char* fmt, va_list args, bool write_core) { // log // logging is more important than user - // she can cancel download, we'd get SIG_PIPE, + // she can cancel download, we'd get SIGPIPE, // nothing would be logged then ::log(fmt, args); @@ -137,30 +163,58 @@ void SAPI::die(const char *fmt, ...) { char body[MAX_STRING]; int content_length=vsnprintf(body, MAX_STRING, fmt, args); - va_end(args); - // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(global_pool, "status", "500"); - SAPI::add_header_attribute(global_pool, "content-type", "text/plain"); + SAPI::add_header_attribute(SAPI_info, "status", "500"); + SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); - SAPI::add_header_attribute(global_pool, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); // send header - SAPI::send_header(global_pool); + SAPI::send_header(SAPI_info); // body - SAPI::send_body(global_pool, body, content_length); + SAPI::send_body(SAPI_info, body, content_length); + + // exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version] + if(write_core) { +#if defined(WIN32) && !defined(_DEBUG) + // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" + exit(1); +#else +#if _MSC_VER + _asm int 3; +#endif + abort(); +#endif + } + else + exit(1); +} + +void SAPI::die(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + die_or_abort(fmt, args, false/*write core?*/); +//unreachable anyway va_end(args); +} - exit(1); +void SAPI::abort(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + die_or_abort(fmt, args, true/*write core?*/); +//unreachable anyway va_end(args); } -const char *SAPI::get_env(Pool& , const char *name) { - return getenv(name); +char* SAPI::get_env(SAPI_Info& , const char* name) { + if(char *local=getenv(name)) + return pa_strdup(local); + else + return 0; } -const char *const *SAPI::environment(Pool&) { +const char* const *SAPI::environment(SAPI_Info&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -170,7 +224,7 @@ const char *const *SAPI::environment(Poo #endif } -size_t SAPI::read_post(Pool& , char *buf, size_t max_bytes) { +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), @@ -183,13 +237,13 @@ size_t SAPI::read_post(Pool& , char *buf return read_size; } -void SAPI::add_header_attribute(Pool& , const char *key, const char *value) { - if(cgi) - printf("%s: %s\n", key, value); +void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { + if( cgi && (!request || !request->console.was_used()) ) + printf("%s: %s\n", dont_store_key, dont_store_value); } /// @todo intelligent cache-control -void SAPI::send_header(Pool& ) { +void SAPI::send_header(SAPI_Info& ) { if(cgi) { // puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); @@ -198,20 +252,20 @@ void SAPI::send_header(Pool& ) { } } -void SAPI::send_body(Pool& , const void *buf, size_t size) { - stdout_write(buf, size); +size_t SAPI::send_body(SAPI_Info& , const void *buf, size_t size) { + return stdout_write(buf, size); } // -static void full_file_spec(const char *file_name, char *buf, size_t buf_size) { +static 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]==':') + || file_name[0] && file_name[1]==':' #endif - ) - strncpy(buf, file_name, buf_size); + ) + strncpy(buf, file_name, buf_size); else { char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); snprintf(buf, buf_size, "%s/%s", cwd, file_name); @@ -223,17 +277,81 @@ static void full_file_spec(const char *f #endif } +static void log_signal(const char* signal_name) { + if(request_info) + SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, cl=%u", + signal_name, + request?"executing code":"reading data", + request_info->uri, + request_info->method, + request_info->content_length); + else + SAPI::log(SAPI_info, "%s received before or after processing request", + signal_name); +} + #ifdef SIGUSR1 -void SIGUSR1_Handler(int /*sig*/){ - SAPI::log(global_pool, "SIGUSR1 received. url=", request?request->info.uri:""); +static void SIGUSR1_handler(int /*sig*/){ + log_signal("SIGUSR1"); } #endif #ifdef SIGPIPE -void SIGPIPE_Handler(int /*sig*/){ - SAPI::log(global_pool, "SIGPIPE received. url=", request?request->info.uri:""); +#define SIGPIPE_NAME "SIGPIPE" +static const String sigpipe_name(SIGPIPE_NAME); +static void SIGPIPE_handler(int /*sig*/){ + Value* sigpipe=0; + if(request) + sigpipe=request->main_class.get_element(sigpipe_name, request->main_class, false); + if(sigpipe && sigpipe->as_bool()) + log_signal("SIGPIPE"); + + execution_canceled=true; if(request) - request->interrupt(); + request->set_interrupted(true); +} +#endif + +#ifdef WIN32 +const char* maybe_reconstruct_IIS_status_in_qs(const char* original) +{ + // 404;http://servername/page[?param=value...] + // ';' should be urlencoded by HTTP standard, so we shouldn't get it from browser + // and can consider that as an indication that this is IIS way to report errors + + if(original + && isdigit((unsigned char)original[0]) + && isdigit((unsigned char)original[1]) + && isdigit((unsigned char)original[2]) + && original[3]==';') + { + size_t original_len=strlen(original); + char* reconstructed=new(PointerFreeGC) char[original_len + +12/*IIS-STATUS=&*/ + +14/*IIS-DOCUMENT=&*/ + +1]; + char* cur=reconstructed; + memcpy(cur, "IIS-STATUS=", 11); cur+=11; + memcpy(cur, original, 3); cur+=3; + *cur++='&'; + + const char* qmark_at=strchr(original, '?'); + memcpy(cur, "IIS-DOCUMENT=", 13); cur+=13; + { + size_t value_len=(qmark_at? qmark_at-original: original_len)-4; + memcpy(cur, original+4, value_len); cur+=value_len; + } + + if(qmark_at) { + *cur++='&'; + strcpy(cur, qmark_at+1/*skip ? itself*/); + } else + *cur=0; + + return reconstructed; + } + + return original; } #endif @@ -244,38 +362,36 @@ main workhorse IIS: remove trailing default-document[index.html] from $request.uri. to do that we need to consult metabase, wich is tested but seems slow. - IIS5 todo find out proper 'illegal call' check */ -static void real_parser_handler( - const char *filespec_to_process, - const char *request_method, bool header_only) { +static void real_parser_handler(const char* filespec_to_process, + const char* request_method, bool header_only) +{ // init socks - init_socks(global_pool); - - // init global classes - init_methoded_array(global_pool); + pa_socks_init(); + // init global variables - pa_globals_init(global_pool); + pa_globals_init(); - // request pool, must be different ptr from global [used in VStateless_class.add_method] - Pool request_pool(&global_pool_storage); - if(!filespec_to_process || !*filespec_to_process) - SAPI::die("Parser/%s", PARSER_VERSION); + SAPI::die("Parser/%s" +#ifdef PA_DEBUG_CGI_ENTRY_EXIT + " with entry/exit tracing" +#endif + , PARSER_VERSION); // Request info - Request::Info request_info; + Request_info request_info; memset(&request_info, 0, sizeof(request_info)); char document_root_buf[MAX_STRING]; if(cgi) { - if(const char *env_document_root=SAPI::get_env(request_pool, "DOCUMENT_ROOT")) + if(const char* env_document_root=getenv("DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) { + else if(const char* path_info=getenv("PATH_INFO")) { // IIS 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("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); } else { @@ -284,70 +400,108 @@ static void real_parser_handler( } request_info.path_translated=filespec_to_process; request_info.method=request_method ? request_method : "GET"; - const char *query_string=SAPI::get_env(request_pool, "QUERY_STRING"); + const char* query_string= +#ifdef WIN32 + maybe_reconstruct_IIS_status_in_qs +#endif + (getenv("QUERY_STRING")); request_info.query_string=query_string; if(cgi) { - if(const char *env_request_uri=SAPI::get_env(request_pool, "REQUEST_URI")) + // few absolute obligatory + const char* path_info=getenv("PATH_INFO"); + if(!path_info) + SAPI::die("CGI: illegal call (missing PATH_INFO)"); + const char* script_name=getenv("SCRIPT_NAME"); + if(!script_name) + SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); + + const char* env_request_uri=getenv("REQUEST_URI"); + if(env_request_uri) request_info.uri=env_request_uri; - else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) + else if(query_string) { - char *reconstructed_uri=(char *)request_pool.malloc( + char* reconstructed_uri=new(PointerFreeGC) char[ strlen(path_info)+1/*'?'*/+ - strlen(query_string)+1/*0*/); + strlen(query_string)+1/*0*/]; strcpy(reconstructed_uri, path_info); strcat(reconstructed_uri, "?"); strcat(reconstructed_uri, query_string); request_info.uri=reconstructed_uri; } else request_info.uri=path_info; - else - throw Exception("parser.runtime", - 0, - "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); - - // they've changed this under IIS5. - if(const char *script_name=SAPI::get_env(request_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 && - script_name_len != uri_len) // under IIS they are the same - SAPI::die("CGI: illegal call"); - } + + if(env_request_uri) { // apache & others stuck to standards + /* + http://parser3/env.html?123 =OK + $request:uri=/env.html?123 + REQUEST_URI='/env.html?123' + SCRIPT_NAME='/cgi-bin/parser3' + PATH_INFO='/env.html' + + http://parser3/cgi-bin/parser3/env.html?123 =ERROR + $request:uri=/cgi-bin/parser3/env.html?123 + REQUEST_URI='/cgi-bin/parser3/env.html?123' + SCRIPT_NAME='/cgi-bin/parser3' + PATH_INFO='/env.html' + */ + size_t script_name_len=strlen(script_name); + size_t uri_len=strlen(env_request_uri); + if(strncmp(env_request_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 { // seen on IIS5 + /* + http://nestle/env.html?123 =OK + $request:uri=/env.html?123 + REQUEST_URI='' + SCRIPT_NAME='/env.html' + PATH_INFO='/env.html' + + http://nestle/cgi-bin/parser3.exe/env.html =ERROR + $request:uri=/env.html + REQUEST_URI='' + SCRIPT_NAME='/cgi-bin/parser3.exe' + PATH_INFO='/env.html' + */ + if(strcmp(script_name, path_info)!=0) + SAPI::die("CGI: illegal call (2)"); + } } else request_info.uri=""; - request_info.content_type=SAPI::get_env(request_pool, "CONTENT_TYPE"); - const char *content_length=SAPI::get_env(request_pool, "CONTENT_LENGTH"); + 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.cookie=SAPI::get_env(request_pool, "HTTP_COOKIE"); + request_info.cookie=getenv("HTTP_COOKIE"); request_info.mail_received=mail_received; + // get request_info ptr for signal handlers + ::request_info=&request_info; + if(execution_canceled) + SAPI::die("Execution canceled"); + +#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); +#endif // prepare to process request - Request request(request_pool, - request_info, -/*#ifdef _DEBUG - String::UL_HTML|String::UL_OPTIMIZE_BIT -#else*/ - cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS -/*#endif*/ - , + Request request(SAPI_info, request_info, + cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS, true /* status_allowed */); // get request ptr for signal handlers ::request=&request; -#ifdef SIGUSR1 - if(signal(SIGUSR1, SIGUSR1_Handler)==SIG_ERR) - SAPI::die("Can not set handler for SIGUSR1"); -#endif -#ifdef SIGPIPE - if(signal(SIGPIPE, SIGPIPE_Handler)==SIG_ERR) - SAPI::die("Can not set handler for SIGPIPE"); -#endif char config_filespec_buf[MAX_STRING]; if(!config_filespec_cstr) { - const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); + 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) @@ -378,71 +532,70 @@ static void real_parser_handler( // no request [prevent signal handlers from accessing invalid memory] ::request=0; - - // - done_socks(); - -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(Pool& pool); - log_pool_stats(request_pool); -#endif -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - SAPI::log(global_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 + // finalize global variables + pa_globals_done(); + // + pa_socks_done(); } -static void call_real_parser_handler__do_SEH( - const char *filespec_to_process, - const char *request_method, bool header_only) { -#if _MSC_VER && !defined(_DEBUG) +#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) +{ + try { + real_parser_handler( + filespec_to_process, + request_method, header_only); + } catch(const Exception& e) { + return e; + } + + return Exception(); +} +static void call_real_parser_handler__supress_system_exception( + const char* filespec_to_process, + const char* request_method, bool header_only) +{ + Exception parser_exception; LPEXCEPTION_POINTERS system_exception=0; + __try { -#endif - real_parser_handler( + parser_exception=call_real_parser_handler__do_PEH_return_it( filespec_to_process, request_method, header_only); - -#if _MSC_VER && !defined(_DEBUG) } __except ( (system_exception=GetExceptionInformation()), - EXCEPTION_EXECUTE_HANDLER) { - + EXCEPTION_EXECUTE_HANDLER) + { + if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception(0, + throw Exception("system", 0, - "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); else - throw Exception(0, 0, "Exception "); - else - throw Exception(0, 0, "Exception "); + throw Exception("system", + 0, + ""); + else + throw Exception("system", + 0, + ""); } -#endif -} -#if _MSC_VER -int failed_new(size_t size) { - SAPI::die("out of memory in 'new', failed to allocated %u bytes", size); - return 0; // not reached -} -#endif - -#ifdef HAVE_SET_NEW_HANDLER -static void failed_new() { - SAPI::die("out of memory in 'new'"); + if(parser_exception) + throw Exception(parser_exception); } #endif -static void usage(const char *program) { +static void usage(const char* program) { printf( - "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" + "Parser/%s\n" + "Copyright(c) 2001-2007 ArtLebedev Group (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -458,6 +611,40 @@ static void usage(const char *program) { } int main(int argc, char *argv[]) { +#ifdef PA_DEBUG_CGI_ENTRY_EXIT + log("main: entry"); +#endif + //_asm int 3; + GC_java_finalization=0; + +#ifndef PA_DEBUG_DISABLE_GC + // Dont collect unless explicitly requested + // this is quicker (~30% ), but less memory-efficient(~8%) + // so deciding for speed + GC_dont_gc=1; +#endif +/* + + Array test; + test+=3; + test+=4; +// int a=test.count(); + int i=0; + scanf("%d", &i); + int b=test.get(i); +// int b=test.get(10); + printf("%d", b);//test.count());*/ + +#ifdef SIGUSR1 + if(signal(SIGUSR1, SIGUSR1_handler)==SIG_ERR) + SAPI::die("Can not set handler for SIGUSR1"); +#endif +#ifdef SIGPIPE + if(signal(SIGPIPE, SIGPIPE_handler)==SIG_ERR) + SAPI::die("Can not set handler for SIGPIPE"); +#endif + + #ifdef DEBUG_MAILRECEIVE if(FILE *fake_in=fopen(DEBUG_MAILRECEIVE, "rt")) { dup2(fake_in->_file, 0/*STDIN_FILENO*/); @@ -465,9 +652,8 @@ int main(int argc, char *argv[]) { #endif #ifdef _DEBUG -// _crtBreakAlloc=33112; + //_crtBreakAlloc=46; #endif -// _asm int 3; argv0=argv[0]; umask(2); @@ -480,9 +666,11 @@ int main(int argc, char *argv[]) { getenv("REQUEST_METHOD"); char *raw_filespec_to_process; - if(cgi) + if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); - else { + if(raw_filespec_to_process && !*raw_filespec_to_process) + raw_filespec_to_process=0; + } else { optind = 1; opterr = 0; int c; @@ -523,10 +711,7 @@ int main(int argc, char *argv[]) { setmode(fileno(stderr), _O_BINARY); #endif -#if _MSC_VER - _set_new_handler(failed_new); - -#ifdef _DEBUG +#if defined(_MSC_VER) && defined(_DEBUG) // Get current flag int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ); @@ -535,44 +720,57 @@ int main(int argc, char *argv[]) { // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(471); - -#endif +// _CrtSetBreakAlloc(61); -#endif - -#ifdef HAVE_SET_NEW_HANDLER - std::set_new_handler(failed_new); + _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); + _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"); + const char* request_method=getenv("REQUEST_METHOD"); bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; try { // global try - call_real_parser_handler__do_SEH( +#ifdef PA_SUPPRESS_SYSTEM_EXCEPTION + call_real_parser_handler__supress_system_exception( +#else + real_parser_handler( +#endif filespec_to_process, request_method, header_only); } catch(const Exception& e) { // global problem // don't allocate anything on pool here: // possible pool' exception not catch-ed now // and there could be out-of-memory exception + char buf[MAX_STRING]; + snprintf(buf, MAX_STRING, "Unhandled exception %s", + e.comment()); + // log it + SAPI::log(SAPI_info, "%s", buf); + + // + int content_length=strlen(buf); + + // prepare header + SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); + SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + + // send header + SAPI::send_header(SAPI_info); + + // send body + if(!header_only) + SAPI::send_body(SAPI_info, buf, content_length); - SAPI::die("exception in request exception handler: %s", e.comment()); -#ifndef _DEBUG - } catch(...) { - SAPI::die(""); -#endif + // unsuccessful finish } - -#ifndef WIN32 - // - if(!cgi) - SAPI::send_body(global_pool, "\n", 1); +#ifdef PA_DEBUG_CGI_ENTRY_EXIT + log("main: successful return"); #endif -//_asm int 3; return 0; }