--- parser3/src/targets/cgi/parser3.C 2003/04/01 15:42:26 1.216.2.30.2.17 +++ parser3/src/targets/cgi/parser3.C 2004/03/23 09:42:14 1.224 @@ -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/01 15:42:26 $"; +static const char * const IDENT_PARSER3_C="$Date: 2004/03/23 09:42:14 $"; #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" @@ -29,7 +27,6 @@ static const char* IDENT_PARSER3_C="$Dat # include #endif -//#define DEBUG_POOL_MALLOC //#define DEBUG_MAILRECEIVE "mailreceive.eml" // consts @@ -114,12 +111,6 @@ void SAPI::log(SAPI_Info&, const char* f } static void die_or_abort(const char* fmt, va_list args, bool write_core) { - //_asm int 3; -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(); - log_pool_stats(SAPI_info); -#endif - // log // logging is more important than user @@ -149,10 +140,12 @@ static void die_or_abort(const char* fmt // exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version] if(write_core) { #if defined(WIN32) && !defined(_DEBUG) - //_asm int 3; // 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 } @@ -232,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); @@ -246,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", @@ -281,9 +273,8 @@ 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(); @@ -294,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")) @@ -391,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 @@ -440,11 +425,6 @@ static void real_parser_handler( // pa_done_socks(); - -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(); - log_pool_stats(request_pool); -#endif } #if _MSC_VER && !defined(_DEBUG) @@ -462,8 +442,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 { @@ -476,7 +456,6 @@ call_real_parser_handler__do_SEH_return_ } __except ( (result.system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { - //_asm int 3; result.with_system_exception=true; } return result; @@ -484,8 +463,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 @@ -512,7 +491,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" @@ -528,6 +507,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 @@ -536,13 +516,15 @@ int main(int argc, char *argv[]) { // so deciding for speed GC_dont_gc=1; #endif - - /* +/* + Array test; test+=3; test+=4; // int a=test.count(); - int b=test.get(0); + int i=0; + scanf("%d", &i); + int b=test.get(i); // int b=test.get(10); printf("%d", b);//test.count());*/ @@ -563,9 +545,8 @@ int main(int argc, char *argv[]) { #endif #ifdef _DEBUG - //_crtBreakAlloc=4042; + //_crtBreakAlloc=46; #endif - //_asm int 3; argv0=argv[0]; umask(2); @@ -632,7 +613,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 ); @@ -652,10 +633,31 @@ 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 } -// _asm int 3; return 0; }