--- parser3/src/targets/cgi/parser3.C 2003/02/21 09:48:58 1.216.2.11 +++ parser3/src/targets/cgi/parser3.C 2003/03/12 11:17:52 1.216.2.26 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2003/02/21 09:48:58 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/03/12 11:17:52 $"; #include "pa_config_includes.h" @@ -42,11 +42,14 @@ 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] // for signal handlers Request *request=0; +Request_info *request_info=0; +bool execution_canceled=false; // SAPI @@ -109,15 +112,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 @@ -130,8 +131,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"); @@ -146,25 +145,39 @@ void SAPI::die(const char* fmt, ...) { // body SAPI::send_body(SAPI_info, body, content_length); -#ifdef WIN32 - //_asm int 3; - // 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&) { @@ -191,13 +204,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 @@ -231,11 +244,17 @@ static void full_file_spec(const char* f } static void log_signal(const char* signal_name) { - SAPI::log(SAPI_info, request? "%s received. uri=%s, qs=%s" - :"%s received. no request being processed", - signal_name, - request && request->request_info.uri?request->request_info.uri:"-", - request && request->request_info.query_string?request->request_info.query_string:"-"); + if(request_info) + SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, qs=%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", + signal_name); } #ifdef SIGUSR1 @@ -247,6 +266,7 @@ static void SIGUSR1_handler(int /*sig*/) #ifdef SIGPIPE static void SIGPIPE_handler(int /*sig*/){ log_signal("SIGPIPE"); + execution_canceled=true; if(request) request->interrupt(); } @@ -259,7 +279,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, @@ -280,9 +299,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; @@ -297,25 +316,25 @@ static void real_parser_handler( } request_info.path_translated=filespec_to_process; request_info.method=request_method ? request_method : "GET"; - CharPtr 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=new(request_pool) char[ + 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); @@ -362,12 +381,16 @@ 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; + // get request_info ptr for signal handlers + ::request_info=&request_info; + if(execution_canceled) + SAPI::die("Execution canceled"); // prepare to process request Request request(request_pool, SAPI_info, @@ -426,13 +449,13 @@ static void real_parser_handler( #endif } -//#if _MSC_VER && !defined(_DEBUG) +#if _MSC_VER && !defined(_DEBUG) # define PA_USE___TRY struct Parser_executed { bool with_system_exception; LPEXCEPTION_POINTERS system_exception; }; -//#endif +#endif static #ifdef PA_USE___TRY @@ -455,7 +478,7 @@ call_real_parser_handler__do_SEH_return_ } __except ( (result.system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { - _asm int 3; + //_asm int 3; result.with_system_exception=true; } return result; @@ -584,21 +607,16 @@ int main(int argc, char *argv[]) { setmode(fileno(stderr), _O_BINARY); #endif -#if _MSC_VER - -#ifdef _DEBUG +#if defined(_MSC_VER) && defined(_DEBUG) // Get current flag int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ); // Turn on leak-checking bit -// tmpFlag |= _CRTDBG_LEAK_CHECK_DF; + tmpFlag |= _CRTDBG_LEAK_CHECK_DF; // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(471); - -#endif - +// _CrtSetBreakAlloc(266630); #endif char filespec_to_process[MAX_STRING]; @@ -617,10 +635,6 @@ 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;