--- parser3/src/targets/cgi/parser3.C 2003/02/14 17:28:20 1.216.2.3 +++ parser3/src/targets/cgi/parser3.C 2003/03/12 09:51:54 1.216.2.24 @@ -5,12 +5,11 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2003/02/14 17:28:20 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/03/12 09:51:54 $"; #include "pa_config_includes.h" #if _MSC_VER -# include # include #endif @@ -29,17 +28,8 @@ static const char* IDENT_PARSER3_C="$Dat #endif //#define DEBUG_POOL_MALLOC -//#define DEBUG_STRING_APPENDS_VS_EXPANDS //#define DEBUG_MAILRECEIVE "mailreceive.eml" -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS -extern ulong - string_piece_appends, - wcontext_result_size, - total_alloc_size, - string_string_shortcut_economy; -#endif - // consts #define REDIRECT_PREFIX "REDIRECT_" @@ -52,6 +42,7 @@ static const char* argv0; static const char* config_filespec_cstr=0; static bool fail_on_config_read_problem=true; +static bool force_header_output=false; 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] @@ -119,14 +110,13 @@ void SAPI::log(SAPI_Info&, const char* f va_end(args); } -void SAPI::die(const char* fmt, ...) { +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(Pool& pool); log_pool_stats(SAPI_info); #endif - va_list args; - va_start(args,fmt); // log // logging is more important than user @@ -139,8 +129,6 @@ 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(SAPI_info, "status", "500"); @@ -155,24 +143,39 @@ void SAPI::die(const char* fmt, ...) { // body SAPI::send_body(SAPI_info, body, content_length); -#ifdef WIN32 - // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" - exit(1); + // 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 - // exit & try to produce core dump - abort(); + abort(); #endif + } + else + exit(1); } -CharPtr SAPI::get_env(SAPI_Info& , const char* name) { - if(char *local=getenv(name)) { - size_t size=strlen(local)+1; - char *heap=new char[size]; - memcpy(heap, local, size); - return CharPtr(heap); - } +void SAPI::die(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + die_or_abort(fmt, args, false/*write core?*/); + va_end(args); +} + +void SAPI::abort(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + die_or_abort(fmt, args, true/*write core?*/); + va_end(args); +} + +char* SAPI::get_env(Pool& pool, SAPI_Info& , const char* name) { + if(char *local=getenv(name)) + return pool.copy(local); else - return CharPtr(0); + return 0; } const char* const *SAPI::environment(SAPI_Info&, Pool&) { @@ -199,13 +202,13 @@ size_t SAPI::read_post(SAPI_Info& , char } void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { - if(cgi) + if(cgi || force_header_output) printf("%s: %s\n", dont_store_key, dont_store_value); } /// @todo intelligent cache-control void SAPI::send_header(SAPI_Info& ) { - if(cgi) { + if(cgi || force_header_output) { // puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); // header | body delimiter @@ -267,7 +270,6 @@ 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, @@ -288,9 +290,9 @@ static void real_parser_handler( Request_info request_info; char document_root_buf[MAX_STRING]; if(cgi) { - if(CharPtr env_document_root=SAPI::get_env(SAPI_info, "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(SAPI_info, "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; @@ -305,25 +307,25 @@ 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(SAPI_info, "QUERY_STRING"); + const char* query_string=getenv("QUERY_STRING"); request_info.query_string=query_string; if(cgi) { // few absolute obligatory - const char* path_info=SAPI::get_env(SAPI_info, "PATH_INFO"); + const char* path_info=getenv("PATH_INFO"); if(!path_info) SAPI::die("CGI: illegal call (missing PATH_INFO)"); - const char* script_name=SAPI::get_env(SAPI_info, "SCRIPT_NAME"); + const char* script_name=getenv("SCRIPT_NAME"); if(!script_name) SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); - const char* env_request_uri=SAPI::get_env(SAPI_info, "REQUEST_URI"); + const char* env_request_uri=getenv("REQUEST_URI"); if(env_request_uri) request_info.uri=env_request_uri; else if(query_string) { - char *reconstructed_uri=(char *)request_pool.malloc( + CharPtr reconstructed_uri(new 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); @@ -370,15 +372,15 @@ static void real_parser_handler( } else request_info.uri=""; - request_info.content_type=SAPI::get_env(SAPI_info, "CONTENT_TYPE"); - const char* content_length=SAPI::get_env(SAPI_info, "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(SAPI_info, "HTTP_COOKIE"); + request_info.cookie=getenv("HTTP_COOKIE"); request_info.mail_received=mail_received; // prepare to process request - Request request(SAPI_info, request_pool, + Request request(request_pool, SAPI_info, request_info, /*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT @@ -432,59 +434,70 @@ static void real_parser_handler( extern void log_pool_stats(Pool& pool); log_pool_stats(request_pool); #endif +} -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - SAPI::log(SAPI_info, - "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); +#if _MSC_VER && !defined(_DEBUG) +# define PA_USE___TRY +struct Parser_executed { + bool with_system_exception; + LPEXCEPTION_POINTERS system_exception; +}; #endif -} - -static void call_real_parser_handler__do_SEH( +static +#ifdef PA_USE___TRY +Parser_executed +#else +void +#endif +call_real_parser_handler__do_SEH_return_it( const char* filespec_to_process, const char* request_method, bool header_only) { -#if _MSC_VER && !defined(_DEBUG) - LPEXCEPTION_POINTERS system_exception=0; +#ifdef PA_USE___TRY + Parser_executed result={false}; __try { #endif real_parser_handler( filespec_to_process, request_method, header_only); -#if _MSC_VER && !defined(_DEBUG) +#ifdef PA_USE___TRY } __except ( - (system_exception=GetExceptionInformation()), + (result.system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { - - if(system_exception) - if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception(0, - 0, - "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); - else - throw Exception(0, 0, "Exception "); - else - throw Exception(0, 0, "Exception "); + //_asm int 3; + result.with_system_exception=true; } + return result; #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 -} +static void call_real_parser_handler__do_SEH( + const char* filespec_to_process, + const char* request_method, bool header_only) { +#ifdef PA_USE___TRY + Parser_executed executed= #endif + call_real_parser_handler__do_SEH_return_it(filespec_to_process, + request_method, header_only); -#ifdef HAVE_SET_NEW_HANDLER -static void failed_new() { - SAPI::die("out of memory in 'new'"); -} +#ifdef PA_USE___TRY + if(executed.with_system_exception) + if(executed.system_exception) + if(_EXCEPTION_RECORD *er=executed.system_exception->ExceptionRecord) + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + else + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "Exception "); + else + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "Exception "); #endif +} static void usage(const char* program) { printf( @@ -521,9 +534,9 @@ int main(int argc, char *argv[]) { #endif #ifdef _DEBUG -// _crtBreakAlloc=33112; + //_crtBreakAlloc=4042; #endif -// _asm int 3; + //_asm int 3; argv0=argv[0]; umask(2); @@ -581,10 +594,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 ); @@ -593,14 +603,7 @@ int main(int argc, char *argv[]) { // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(471); - -#endif - -#endif - -#ifdef HAVE_SET_NEW_HANDLER - std::set_new_handler(failed_new); +// _CrtSetBreakAlloc(266630); #endif char filespec_to_process[MAX_STRING]; @@ -619,12 +622,8 @@ int main(int argc, char *argv[]) { // and there could be out-of-memory exception SAPI::die("exception in request exception handler: %s", e.comment()); -#ifndef _DEBUG - } catch(...) { - SAPI::die(""); -#endif } - //_asm int 3; +// _asm int 3; return 0; }