--- parser3/src/targets/cgi/parser3.C 2003/04/02 08:11:31 1.216.2.30.2.19 +++ parser3/src/targets/cgi/parser3.C 2004/04/01 11:43:54 1.225 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2003/04/02 08:11:31 $"; +static const char * const IDENT_PARSER3_C="$Date: 2004/04/01 11:43:54 $"; #include "pa_config_includes.h" @@ -20,8 +20,6 @@ static const char* IDENT_PARSER3_C="$Dat #include "pa_socks.h" #include "pa_version.h" - - #ifdef WIN32 # include # include "getopt.h" @@ -145,6 +143,9 @@ static void die_or_abort(const char* fmt // 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 } @@ -224,7 +225,7 @@ static void full_file_spec(const char* f || 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); @@ -238,12 +239,11 @@ static void full_file_spec(const char* f static void log_signal(const char* signal_name) { if(request_info) - SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, qs=%s, cl=%u", + 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->query_string, request_info->content_length); else SAPI::log(SAPI_info, "%s received before or after processing request", @@ -273,11 +273,10 @@ main workhorse 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) { +static void real_parser_handler(const char* filespec_to_process, + const char* request_method, bool header_only) { // init socks - pa_init_socks(); + pa_socks_init(); // init global variables pa_globals_init(); @@ -286,7 +285,7 @@ static void real_parser_handler( SAPI::die("Parser/%s", 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=getenv("DOCUMENT_ROOT")) @@ -383,14 +382,8 @@ static void real_parser_handler( SAPI::die("Execution canceled"); // prepare to process request - Request request(SAPI_info, - request_info, -/*#ifdef _DEBUG - String::L_HTML|String::L_OPTIMIZE_BIT -#else*/ - cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_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 @@ -430,8 +423,11 @@ static void real_parser_handler( // no request [prevent signal handlers from accessing invalid memory] ::request=0; + // finalize global variables + pa_globals_done(); + // - pa_done_socks(); + pa_socks_done(); } #if _MSC_VER && !defined(_DEBUG) @@ -449,8 +445,8 @@ Parser_executed void #endif call_real_parser_handler__do_SEH_return_it( - const char* filespec_to_process, - const char* request_method, bool header_only) { + const char* filespec_to_process, + const char* request_method, bool header_only) { #ifdef PA_USE___TRY Parser_executed result={false}; __try { @@ -470,8 +466,8 @@ call_real_parser_handler__do_SEH_return_ } static void call_real_parser_handler__do_SEH( - const char* filespec_to_process, - const char* request_method, bool header_only) { + const char* filespec_to_process, + const char* request_method, bool header_only) { #ifdef PA_USE___TRY Parser_executed executed= #endif @@ -498,7 +494,7 @@ static void call_real_parser_handler__do static void usage(const char* program) { printf( - "Parser/%s Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)\n" + "Parser/%s Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -514,6 +510,7 @@ static void usage(const char* program) { } int main(int argc, char *argv[]) { + //_asm int 3; GC_java_finalization=0; #ifndef PA_DEBUG_DISABLE_GC @@ -551,7 +548,7 @@ int main(int argc, char *argv[]) { #endif #ifdef _DEBUG - //_crtBreakAlloc=4042; + //_crtBreakAlloc=46; #endif argv0=argv[0]; @@ -619,7 +616,7 @@ int main(int argc, char *argv[]) { // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(60); +// _CrtSetBreakAlloc(61); _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); @@ -639,8 +636,30 @@ int main(int argc, char *argv[]) { // don't allocate anything on pool here: // possible pool' exception not catch-ed now // and there could be out-of-memory exception + const char* body=e.comment(); + char buf[MAX_STRING]; + snprintf(buf, MAX_STRING, "exception in request exception handler: %s", + body); + // 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()); + // unsuccessful finish } return 0;