--- parser3/src/targets/cgi/parser3.C 2007/08/17 08:16:11 1.243 +++ parser3/src/targets/cgi/parser3.C 2019/12/25 22:01:03 1.280 @@ -1,30 +1,25 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_PARSER3_C="$Date: 2007/08/17 08:16:11 $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.280 2019/12/25 22:01:03 moko Exp $"; #include "pa_config_includes.h" -#if _MSC_VER -# include -#endif - #include "pa_sapi.h" #include "classes.h" #include "pa_common.h" #include "pa_request.h" -#include "pa_socks.h" #include "pa_version.h" +#include "pa_vconsole.h" -#ifdef WIN32 -# include -# include "getopt.h" -#else -# include +#ifdef _MSC_VER +#include +#include +#include #endif // defines @@ -32,12 +27,10 @@ static const char * const IDENT_PARSER3_ // comment remove me after debugging //#define PA_DEBUG_CGI_ENTRY_EXIT "c:\\parser\\debug-parser3.log" -#if _MSC_VER && !defined(_DEBUG) +#if defined(_MSC_VER) && !defined(_DEBUG) # define PA_SUPPRESS_SYSTEM_EXCEPTION #endif -//#define DEBUG_MAILRECEIVE "mailreceive.eml" - // consts #define REDIRECT_PREFIX "REDIRECT_" @@ -45,12 +38,15 @@ static const char * const IDENT_PARSER3_ #define PARSER_LOG_ENV_NAME "CGI_PARSER_LOG" /// IIS refuses to read bigger chunks -const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M +const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M static const char* argv0; static const char* config_filespec_cstr=0; static bool fail_on_config_read_problem=true; +static int args_skip=1; +static char** argv_all = NULL; + 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] @@ -61,7 +57,10 @@ bool execution_canceled=false; // SAPI -class SAPI_Info{} SAPI_info; +class SAPI_Info { +public: + int http_response_code; +} SAPI_info = { 0 }; static void log(const char* fmt, va_list args) { bool opened=false; @@ -74,7 +73,7 @@ static void log(const char* fmt, va_list f=fopen(log_by_env, "at"); opened=f!=0; } -#ifdef PA_DEBUG_CGI_ENTRY_EXIT +#ifdef PA_DEBUG_CGI_ENTRY_EXIT f=fopen(PA_DEBUG_CGI_ENTRY_EXIT, "at"); opened=f!=0; #endif @@ -82,16 +81,13 @@ static void log(const char* fmt, va_list if(!opened && config_filespec_cstr) { char beside_config_path[MAX_STRING]; strncpy(beside_config_path, config_filespec_cstr, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; - if(!( - rsplit(beside_config_path, '/') || - rsplit(beside_config_path, '\\'))) { // strip filename + if(!(rsplit(beside_config_path, '/') || rsplit(beside_config_path, '\\'))) { // strip filename // no path, just filename beside_config_path[0]='.'; beside_config_path[1]=0; } char file_spec[MAX_STRING]; - snprintf(file_spec, MAX_STRING, - "%s/parser3.log", beside_config_path); + snprintf(file_spec, MAX_STRING, "%s/parser3.log", beside_config_path); f=fopen(file_spec, "at"); opened=f!=0; } @@ -106,19 +102,17 @@ static void log(const char* fmt, va_list time_t t=time(0); if(const char* stamp=ctime(&t)) { // never saw that if(size_t len=strlen(stamp)) // saw once stamp being ="" - fprintf(f, "[%.*s] [%u] ", len-1, stamp, - (unsigned int)getpid() - ); + fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)getpid() ); } // message - char buf[MAX_STRING]; - size_t size=vsnprintf(buf, MAX_STRING, fmt, args); - remove_crlf(buf, buf+size); + char buf[MAX_LOG_STRING]; + size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); + size=remove_crlf(buf, buf+size); fwrite(buf, size, 1, f); if(request_info) - fprintf(f, " [uri=%s, method=%s, cl=%u]", + fprintf(f, " [uri=%s, method=%s, cl=%lu]", request_info->uri? request_info->uri: "", request_info->method? request_info->method: "", request_info->content_length); @@ -133,9 +127,10 @@ static void log(const char* fmt, va_list else fflush(f); } + #ifdef PA_DEBUG_CGI_ENTRY_EXIT static void log(const char* fmt, ...) { - va_list args; + va_list args; va_start(args,fmt); log(fmt, args); va_end(args); @@ -144,20 +139,13 @@ static void log(const char* fmt, ...) { // appends to parser3.log located beside my binary if openable, to stderr otherwize void SAPI::log(SAPI_Info&, const char* fmt, ...) { - va_list args; + va_list args; va_start(args,fmt); ::log(fmt, args); va_end(args); } static void die_or_abort(const char* fmt, va_list args, bool write_core) { - // log - - // logging is more important than user - // she can cancel download, we'd get SIGPIPE, - // nothing would be logged then - ::log(fmt, args); - // inform user char body[MAX_STRING]; @@ -165,11 +153,13 @@ static void die_or_abort(const char* fmt // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(SAPI_info, "status", "500"); - SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); + // capitalized headers passed for preventing malloc during capitalization + SAPI::add_header_attribute(SAPI_info, HTTP_STATUS_CAPITALIZED, "500"); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain"); + // don't use 'format' function because it calls malloc char content_length_cstr[MAX_NUMBER]; snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); - SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH_CAPITALIZED, content_length_cstr); // send header SAPI::send_header(SAPI_info); @@ -179,42 +169,50 @@ 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) +#ifdef WIN32 // 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 - } - else + } else exit(1); } void SAPI::die(const char* fmt, ...) { - va_list args; + va_list args; + + // logging first, can't log inside die_or_abort due to vsnprintf (bug #106) + va_start(args,fmt); + ::log(fmt, args); + va_end(args); + va_start(args, fmt); - die_or_abort(fmt, args, false/*write core?*/); -//unreachable anyway va_end(args); + die_or_abort(fmt, args, false /*write core?*/); +// va_end(args); } void SAPI::abort(const char* fmt, ...) { - va_list args; + va_list args; + + // logging first, can't log inside die_or_abort due to vsnprintf (bug #106) + va_start(args,fmt); + ::log(fmt, args); + va_end(args); + va_start(args, fmt); - die_or_abort(fmt, args, true/*write core?*/); -//unreachable anyway va_end(args); + die_or_abort(fmt, args, true /*write core?*/); +// va_end(args); } -char* SAPI::get_env(SAPI_Info& , const char* name) { +char* SAPI::Env::get(SAPI_Info& , const char* name) { if(char *local=getenv(name)) return pa_strdup(local); else return 0; } -const char* const *SAPI::environment(SAPI_Info&) { +const char* const *SAPI::Env::get(SAPI_Info&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -227,8 +225,7 @@ const char* const *SAPI::environment(SAP size_t SAPI::read_post(SAPI_Info& , char *buf, size_t max_bytes) { size_t read_size=0; do { - ssize_t chunk_size=read(fileno(stdin), - buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); + ssize_t chunk_size=read(fileno(stdin), buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); if(chunk_size<=0) break; read_size+=chunk_size; @@ -238,16 +235,14 @@ 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(strcasecmp(dont_store_key, HTTP_STATUS)==0) + SAPI_info.http_response_code=atoi(dont_store_value); if( cgi && (!request || !request->console.was_used()) ) - printf("%s: %s\n", dont_store_key, dont_store_value); + printf("%s: %s\n", capitalize(dont_store_key), dont_store_value); } -/// @todo intelligent cache-control void SAPI::send_header(SAPI_Info& ) { if(cgi) { -// puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); - - // header | body delimiter puts(""); } } @@ -256,19 +251,17 @@ size_t SAPI::send_body(SAPI_Info& , cons return stdout_write(buf, size); } -// - static void full_file_spec(const char* file_name, char *buf, size_t buf_size) { if(file_name) if(file_name[0]=='/' #ifdef WIN32 || file_name[0] && file_name[1]==':' #endif - ) - strncpy(buf, file_name, buf_size); - else { - char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); - snprintf(buf, buf_size, "%s/%s", cwd, file_name); + ){ + strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; + } else { + char cwd[MAX_STRING]; + snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); } else buf[0]=0; @@ -281,7 +274,7 @@ static void log_signal(const char* signa if(request_info) SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, cl=%u", signal_name, - request?"executing code":"reading data", + request ? "executing code" : "reading data", request_info->uri, request_info->method, request_info->content_length); @@ -302,13 +295,13 @@ static const String sigpipe_name(SIGPIPE static void SIGPIPE_handler(int /*sig*/){ Value* sigpipe=0; if(request) - sigpipe=request->main_class.get_element(sigpipe_name, request->main_class, false); + sigpipe=request->main_class.get_element(sigpipe_name); if(sigpipe && sigpipe->as_bool()) - log_signal("SIGPIPE"); + log_signal(SIGPIPE_NAME); execution_canceled=true; if(request) - request->set_interrupted(true); + request->set_skip(Request::SKIP_INTERRUPTED); } #endif @@ -319,17 +312,9 @@ const char* maybe_reconstruct_IIS_status // ';' should be urlencoded by HTTP standard, so we shouldn't get it from browser // and can consider that as an indication that this is IIS way to report errors - if(original - && isdigit((unsigned char)original[0]) - && isdigit((unsigned char)original[1]) - && isdigit((unsigned char)original[2]) - && original[3]==';') - { + if(original && isdigit((unsigned char)original[0]) && isdigit((unsigned char)original[1]) && isdigit((unsigned char)original[2]) && original[3]==';'){ size_t original_len=strlen(original); - char* reconstructed=new(PointerFreeGC) char[original_len - +12/*IIS-STATUS=&*/ - +14/*IIS-DOCUMENT=&*/ - +1]; + char* reconstructed=new(PointerFreeGC) char[original_len +12/*IIS-STATUS=&*/ +14/*IIS-DOCUMENT=&*/ +1]; char* cur=reconstructed; memcpy(cur, "IIS-STATUS=", 11); cur+=11; memcpy(cur, original, 3); cur+=3; @@ -338,7 +323,7 @@ const char* maybe_reconstruct_IIS_status const char* qmark_at=strchr(original, '?'); memcpy(cur, "IIS-DOCUMENT=", 13); cur+=13; { - size_t value_len=(qmark_at? qmark_at-original: original_len)-4; + size_t value_len=(qmark_at ? qmark_at-original : original_len)-4; memcpy(cur, original+4, value_len); cur+=value_len; } @@ -355,21 +340,29 @@ const char* maybe_reconstruct_IIS_status } #endif + +class RequestController { +public: + RequestController(Request* r){ + ::request=r; + } + ~RequestController(){ + ::request=0; + } +}; + + /** main workhorse - @todo - IIS: remove trailing default-document[index.html] from $request.uri. - to do that we need to consult metabase, - wich is tested but seems slow. + @todo + IIS: remove trailing default-document[index.html] from $request.uri. + 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) -{ - // init socks - pa_socks_init(); +static void real_parser_handler(const char* filespec_to_process, const char* request_method, bool header_only) { - // init global variables + // init libraries pa_globals_init(); if(!filespec_to_process || !*filespec_to_process) @@ -391,9 +384,7 @@ static void real_parser_handler(const ch memcpy(document_root_buf, filespec_to_process, len); document_root_buf[len]=0; request_info.document_root=document_root_buf; } else - throw Exception(PARSER_RUNTIME, - 0, - "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); + throw Exception(PARSER_RUNTIME, 0, "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); } else { full_file_spec("", document_root_buf, sizeof(document_root_buf)); request_info.document_root=document_root_buf; @@ -415,14 +406,12 @@ static void real_parser_handler(const ch if(!script_name) SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); - const char* env_request_uri=getenv("REQUEST_URI"); + const char* env_request_uri=request_info.strip_absolute_uri(getenv("REQUEST_URI")); if(env_request_uri) request_info.uri=env_request_uri; else if(query_string) { - char* reconstructed_uri=new(PointerFreeGC) char[ - strlen(path_info)+1/*'?'*/+ - strlen(query_string)+1/*0*/]; + char* reconstructed_uri=new(PointerFreeGC) char[strlen(path_info) + 1/*'?'*/+ strlen(query_string) + 1/*0*/]; strcpy(reconstructed_uri, path_info); strcat(reconstructed_uri, "?"); strcat(reconstructed_uri, query_string); @@ -446,8 +435,7 @@ static void real_parser_handler(const ch */ size_t script_name_len=strlen(script_name); size_t uri_len=strlen(env_request_uri); - if(strncmp(env_request_uri, script_name, script_name_len)==0 && - script_name_len != uri_len) // under IIS they are the same + if(strncmp(env_request_uri, script_name, script_name_len)==0 && script_name_len != uri_len) // under IIS they are the same SAPI::die("CGI: illegal call (1)"); } else { // seen on IIS5 /* @@ -475,6 +463,9 @@ static void real_parser_handler(const ch request_info.cookie=getenv("HTTP_COOKIE"); request_info.mail_received=mail_received; + request_info.argv=argv_all; + request_info.args_skip=args_skip; + // get request_info ptr for signal handlers ::request_info=&request_info; if(execution_canceled) @@ -492,81 +483,61 @@ static void real_parser_handler(const ch #endif // prepare to process request - 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 - ::request=&request; - - char config_filespec_buf[MAX_STRING]; - if(!config_filespec_cstr) { - const char* config_by_env=getenv(PARSER_CONFIG_ENV_NAME); - if(!config_by_env) - config_by_env=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); - if(config_by_env) - config_filespec_cstr=config_by_env; - else { - // beside by binary - char beside_binary_path[MAX_STRING]; - strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary - if(!( - rsplit(beside_binary_path, '/') || - rsplit(beside_binary_path, '\\'))) { // strip filename - // no path, just filename - // @todo full path, not ./! - beside_binary_path[0]='.'; beside_binary_path[1]=0; + Request request(SAPI_info, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); + + { + // get ::request ptr for signal handlers + RequestController rc(&request); + + char config_filespec_buf[MAX_STRING]; + if(!config_filespec_cstr) { + const char* config_by_env=getenv(PARSER_CONFIG_ENV_NAME); + if(!config_by_env) + config_by_env=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(config_by_env) + config_filespec_cstr=config_by_env; + else { + // beside by binary + char beside_binary_path[MAX_STRING]; + strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary + if(!(rsplit(beside_binary_path, '/') || rsplit(beside_binary_path, '\\'))) { // strip filename + // no path, just filename + // @todo full path, not ./! + beside_binary_path[0]='.'; beside_binary_path[1]=0; + } + snprintf(config_filespec_buf, MAX_STRING, "%s/%s", beside_binary_path, AUTO_FILE_NAME); + config_filespec_cstr=config_filespec_buf; + fail_on_config_read_problem=entry_exists(config_filespec_cstr); } - snprintf(config_filespec_buf, MAX_STRING, - "%s/%s", - beside_binary_path, AUTO_FILE_NAME); - config_filespec_cstr=config_filespec_buf; - fail_on_config_read_problem=entry_exists(config_filespec_cstr); } - } - - // process the request - request.core( - config_filespec_cstr, fail_on_config_read_problem, - header_only); + + // process the request + request.core(config_filespec_cstr, fail_on_config_read_problem, header_only); - // no request [prevent signal handlers from accessing invalid memory] - ::request=0; + // ::request cleared in RequestController desctructor to prevent signal handlers from accessing invalid memory + } - // finalize global variables + // finalize libraries pa_globals_done(); - - // - pa_socks_done(); } #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION -static const Exception -call_real_parser_handler__do_PEH_return_it( - const char* filespec_to_process, - const char* request_method, bool header_only) -{ +static const Exception call_real_parser_handler__do_PEH_return_it(const char* filespec_to_process, const char* request_method, bool header_only){ try { - real_parser_handler( - filespec_to_process, - request_method, header_only); + real_parser_handler(filespec_to_process, request_method, header_only); } catch(const Exception& e) { return e; } return Exception(); } -static void call_real_parser_handler__supress_system_exception( - const char* filespec_to_process, - const char* request_method, bool header_only) -{ + +static void call_real_parser_handler__supress_system_exception(const char* filespec_to_process, const char* request_method, bool header_only){ Exception parser_exception; LPEXCEPTION_POINTERS system_exception=0; __try { - parser_exception=call_real_parser_handler__do_PEH_return_it( - filespec_to_process, - request_method, header_only); + parser_exception=call_real_parser_handler__do_PEH_return_it(filespec_to_process, request_method, header_only); } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) @@ -574,28 +545,26 @@ static void call_real_parser_handler__su if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception("system", - 0, - "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + throw Exception("system", 0, "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); else - throw Exception("system", - 0, - ""); + throw Exception("system", 0, ""); else - throw Exception("system", - 0, - ""); + throw Exception("system", 0, ""); } if(parser_exception) throw Exception(parser_exception); } + +#define REAL_PARSER_HANDLER call_real_parser_handler__supress_system_exception +#else +#define REAL_PARSER_HANDLER real_parser_handler #endif static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright(c) 2001-2007 ArtLebedev Group (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -604,8 +573,8 @@ static void usage(const char* program) { " -m Parse mail, put received letter to $mail:received\n" #endif " -f config_file Use this config file (/path/to/auto.p)\n" - " -h Display usage information (this message)\n" - , PARSER_VERSION, + " -h Display usage information (this message)\n", + PARSER_VERSION, program); exit(EINVAL); } @@ -614,26 +583,14 @@ int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: entry"); #endif - //_asm int 3; - GC_java_finalization=0; #ifndef PA_DEBUG_DISABLE_GC + GC_java_finalization=0; // Dont collect unless explicitly requested // this is quicker (~30% ), but less memory-efficient(~8%) // so deciding for speed GC_dont_gc=1; #endif -/* - - Array test; - test+=3; - test+=4; -// int a=test.count(); - int i=0; - scanf("%d", &i); - int b=test.get(i); -// int b=test.get(10); - printf("%d", b);//test.count());*/ #ifdef SIGUSR1 if(signal(SIGUSR1, SIGUSR1_handler)==SIG_ERR) @@ -644,68 +601,61 @@ int main(int argc, char *argv[]) { SAPI::die("Can not set handler for SIGPIPE"); #endif - -#ifdef DEBUG_MAILRECEIVE - if(FILE *fake_in=fopen(DEBUG_MAILRECEIVE, "rt")) { - dup2(fake_in->_file, 0/*STDIN_FILENO*/); - } -#endif - -#ifdef _DEBUG - //_crtBreakAlloc=46; -#endif + argv_all=argv; argv0=argv[0]; umask(2); // were we started as CGI? - cgi= - getenv("SERVER_SOFTWARE") || - getenv("SERVER_NAME") || - getenv("GATEWAY_INTERFACE") || - getenv("REQUEST_METHOD"); - + cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); + char *raw_filespec_to_process; if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); if(raw_filespec_to_process && !*raw_filespec_to_process) raw_filespec_to_process=0; } else { - optind = 1; - opterr = 0; - int c; - while((c = getopt(argc, argv, "hf:" -#ifdef WITH_MAILRECEIVE - "m" -#endif - )) > 0) { - switch (c) { - case 'h': - usage(argv[0]); - break; - case 'f': - config_filespec_cstr=optarg; + int optind=1; + while(optind < argc){ + char *carg = argv[optind]; + if(carg[0] != '-') break; + + for(size_t k = 1; k < strlen(carg); k++){ + char c = carg[k]; + switch (c) { + case 'h': + usage(argv[0]); + break; + case 'f': + if(optind < argc - 1){ + optind++; + config_filespec_cstr=argv[optind]; + } + break; #ifdef WITH_MAILRECEIVE - case 'm': - mail_received=true; - break; -#endif - default: - fprintf(stderr, "%s: invalid option '%c'\n", argv[0], optopt); - usage(argv[0]); - break; + case 'm': + mail_received=true; + break; +#endif + default: + fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c); + usage(argv[0]); + break; + } } + optind++; } - if (optind != argc - 1) { + + if (optind > argc - 1) { fprintf(stderr, "%s: file not specified\n", argv[0]); usage(argv[0]); } - - raw_filespec_to_process=argv[optind++]; + raw_filespec_to_process=argv[optind]; + args_skip=optind; } -#ifdef WIN32 +#ifdef _MSC_VER setmode(fileno(stdin), _O_BINARY); setmode(fileno(stdout), _O_BINARY); setmode(fileno(stderr), _O_BINARY); @@ -720,7 +670,6 @@ int main(int argc, char *argv[]) { // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(61); _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); @@ -733,20 +682,13 @@ int main(int argc, char *argv[]) { bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; try { // global try -#ifdef PA_SUPPRESS_SYSTEM_EXCEPTION - call_real_parser_handler__supress_system_exception( -#else - real_parser_handler( -#endif - filespec_to_process, - request_method, header_only); + REAL_PARSER_HANDLER(filespec_to_process, request_method, header_only); } catch(const Exception& e) { // global problem // don't allocate anything on pool here: // possible pool' exception not catch-ed now // and there could be out-of-memory exception char buf[MAX_STRING]; - snprintf(buf, MAX_STRING, "Unhandled exception %s", - e.comment()); + snprintf(buf, MAX_STRING, "Unhandled exception %s", e.comment()); // log it SAPI::log(SAPI_info, "%s", buf); @@ -754,10 +696,12 @@ int main(int argc, char *argv[]) { int content_length=strlen(buf); // prepare header - SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); + // capitalized headers are used for preventing malloc during capitalization + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain"); + // don't use 'format' function because it calls malloc 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); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH_CAPITALIZED, content_length_cstr); // send header SAPI::send_header(SAPI_info); @@ -772,5 +716,5 @@ int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: successful return"); #endif - return 0; + return SAPI_info.http_response_code < 100 ? SAPI_info.http_response_code : 0; }