--- parser3/src/targets/cgi/parser3.C 2002/08/14 11:37:14 1.194 +++ parser3/src/targets/cgi/parser3.C 2002/12/09 13:02:36 1.211 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2002/08/14 11:37:14 $"; +static const char* IDENT_PARSER3_C="$Date: 2002/12/09 13:02:36 $"; #include "pa_config_includes.h" @@ -20,6 +20,7 @@ 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 @@ -29,11 +30,9 @@ static const char* IDENT_PARSER3_C="$Dat # include #endif -#include "fixopt.h" - //#define DEBUG_POOL_MALLOC //#define DEBUG_STRING_APPENDS_VS_EXPANDS -//#define DEBUG_MAILRECEIVE "test.eml" +//#define DEBUG_MAILRECEIVE "mailreceive.eml" #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS extern ulong @@ -55,10 +54,14 @@ static const char *argv0; static const char *config_filespec_cstr=0; static bool fail_on_config_read_problem=true; -static Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] +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; + // SAPI static void log(const char *fmt, va_list args) { @@ -85,6 +88,9 @@ 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 @@ -118,7 +124,7 @@ void SAPI::log(Pool& , const char *fmt, void SAPI::die(const char *fmt, ...) { #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); - log_pool_stats(*pool); + log_pool_stats(global_pool); #endif va_list args; @@ -126,7 +132,7 @@ void SAPI::die(const char *fmt, ...) { // 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); @@ -139,19 +145,20 @@ void SAPI::die(const char *fmt, ...) { // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(*pool, "status", "500"); - SAPI::add_header_attribute(*pool, "content-type", "text/plain"); + SAPI::add_header_attribute(global_pool, "status", "500"); + SAPI::add_header_attribute(global_pool, "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(*pool, "content-length", content_length_cstr); + SAPI::add_header_attribute(global_pool, "content-length", content_length_cstr); // send header - SAPI::send_header(*pool); + SAPI::send_header(global_pool); // body - SAPI::send_body(*pool, body, content_length); + SAPI::send_body(global_pool, body, content_length); - exit(1); + // exit & try to produce core dump + abort(); } const char *SAPI::get_env(Pool& , const char *name) { @@ -171,7 +178,7 @@ const char *const *SAPI::environment(Poo size_t SAPI::read_post(Pool& , char *buf, size_t max_bytes) { size_t read_size=0; do { - int chunk_size=read(fileno(stdin), + ssize_t chunk_size=read(fileno(stdin), buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); if(chunk_size<=0) break; @@ -206,9 +213,9 @@ static void full_file_spec(const char *f 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); else { char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); @@ -221,6 +228,28 @@ static void full_file_spec(const char *f #endif } +static void log_signal(const char *signal_name) { + SAPI::log(global_pool, request? "%s received. uri=%s, qs=%s" + :"%s received. no request being processed", + signal_name, + request && request->info.uri?request->info.uri:"-", + request && request->info.query_string?request->info.query_string:"-"); +} + +#ifdef SIGUSR1 +static void SIGUSR1_handler(int /*sig*/){ + log_signal("SIGUSR1"); +} +#endif + +#ifdef SIGPIPE +static void SIGPIPE_handler(int /*sig*/){ + log_signal("SIGPIPE"); + if(request) + request->interrupt(); +} +#endif + /** main workhorse @@ -234,13 +263,16 @@ static void real_parser_handler( const char *filespec_to_process, const char *request_method, bool header_only) { // init socks - init_socks(*pool); + init_socks(global_pool); // init global classes - init_methoded_array(*pool); + init_methoded_array(global_pool); // init global variables - pa_globals_init(*pool); + pa_globals_init(global_pool); + // 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); @@ -248,9 +280,9 @@ static void real_parser_handler( Request::Info request_info; char document_root_buf[MAX_STRING]; if(cgi) { - if(const char *env_document_root=SAPI::get_env(*pool, "DOCUMENT_ROOT")) + if(const char *env_document_root=SAPI::get_env(request_pool, "DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) { + else if(const char *path_info=SAPI::get_env(request_pool, "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; @@ -265,14 +297,14 @@ 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(*pool, "QUERY_STRING"); + const char *query_string=SAPI::get_env(request_pool, "QUERY_STRING"); request_info.query_string=query_string; if(cgi) { - if(const char *env_request_uri=SAPI::get_env(*pool, "REQUEST_URI")) + if(const char *env_request_uri=SAPI::get_env(request_pool, "REQUEST_URI")) request_info.uri=env_request_uri; - else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) + else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) if(query_string) { - char *reconstructed_uri=(char *)pool->malloc( + char *reconstructed_uri=(char *)request_pool.malloc( strlen(path_info)+1/*'?'*/+ strlen(query_string)+1/*0*/); strcpy(reconstructed_uri, path_info); @@ -286,27 +318,26 @@ static void real_parser_handler( 0, "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); -#ifndef WIN32 // they've changed this under IIS5. - if(const char *script_name=SAPI::get_env(*pool, "SCRIPT_NAME")) { + 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"); } -#endif } else request_info.uri=""; - request_info.content_type=SAPI::get_env(*pool, "CONTENT_TYPE"); - const char *content_length=SAPI::get_env(*pool, "CONTENT_LENGTH"); + 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_length=(content_length?atoi(content_length):0); - request_info.cookie=SAPI::get_env(*pool, "HTTP_COOKIE"); + request_info.cookie=SAPI::get_env(request_pool, "HTTP_COOKIE"); request_info.mail_received=mail_received; + // prepare to process request - Request request(*pool, + Request request(request_pool, request_info, /*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT @@ -315,7 +346,10 @@ static void real_parser_handler( /*#endif*/ , true /* status_allowed */); - + + // get request ptr for signal handlers + ::request=&request; + char config_filespec_buf[MAX_STRING]; if(!config_filespec_cstr) { const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); @@ -338,7 +372,7 @@ static void real_parser_handler( "%s/%s", beside_binary_path, AUTO_FILE_NAME); config_filespec_cstr=config_filespec_buf; - fail_on_config_read_problem=false; + fail_on_config_read_problem=entry_exists(config_filespec_cstr); } } @@ -346,17 +380,20 @@ static void real_parser_handler( request.core( config_filespec_cstr, fail_on_config_read_problem, header_only); + + // 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(*pool); + log_pool_stats(request_pool); #endif #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - SAPI::log(*pool, + 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, @@ -425,16 +462,16 @@ static void usage(const char *program) { exit(EINVAL); } -int main(int raw_argc, char *raw_argv[]) { - int argc; - char **argv; - fixopt( - raw_argc, raw_argv, - argc, argv); - - Pool_storage global_pool_storage; - Pool global_pool(&global_pool_storage); - pool=&global_pool; +int main(int argc, char *argv[]) { +#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")) { @@ -458,9 +495,11 @@ int main(int raw_argc, char *raw_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; @@ -549,8 +588,9 @@ int main(int raw_argc, char *raw_argv[]) #ifndef WIN32 // if(!cgi) - SAPI::send_body(*pool, "\n", 1); + SAPI::send_body(global_pool, "\n", 1); #endif -//_asm int 3; + + //_asm int 3; return 0; }