--- parser3/src/targets/cgi/parser3.C 2001/11/15 20:26:34 1.133 +++ parser3/src/targets/cgi/parser3.C 2001/12/13 10:37:04 1.147 @@ -4,13 +4,16 @@ Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: parser3.C,v 1.133 2001/11/15 20:26:34 paf Exp $ + $Id: parser3.C,v 1.147 2001/12/13 10:37:04 paf Exp $ */ #include "pa_config_includes.h" #ifdef WIN32 # include +#endif + +#if _MSC_VER # include #endif @@ -111,11 +114,41 @@ 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); +#endif + va_list args; va_start(args,fmt); + // log + + // logging is more important than user + // she can cancel download, we'd get SIG_PIPE, + // nothing would be logged then ::log(fmt, args); + + // inform user + + 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(pool, "status", "500"); + SAPI::add_header_attribute(pool, "content-type", "text/plain"); + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); + SAPI::add_header_attribute(pool, "content-length", content_length_cstr); + + // send header + SAPI::send_header(pool); + + // body + SAPI::send_body(pool, body, content_length); + exit(1); } @@ -144,7 +177,7 @@ void SAPI::add_header_attribute(Pool& , /// @todo intelligent cache-control void SAPI::send_header(Pool& ) { if(cgi) { - puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); +// puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); // header | body delimiter puts(""); @@ -174,6 +207,7 @@ 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 */ void real_parser_handler( const char *filespec_to_process, @@ -198,9 +232,7 @@ void real_parser_handler( pa_globals_init(pool); if(!filespec_to_process) - throw Exception(0, 0, - 0, - "Parser/%s", PARSER_VERSION); + SAPI::die("Parser/%s", PARSER_VERSION); // Request info Request::Info request_info; @@ -248,15 +280,16 @@ 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")) { 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 - throw Exception(0, 0, - 0, - "CGI: illegal call"); + SAPI::die("CGI: illegal call"); } +#endif } else request_info.uri=0; @@ -269,7 +302,12 @@ void real_parser_handler( // prepare to process request Request request(pool, request_info, - cgi ? String::UL_USER_HTML : String::UL_AS_IS, +#ifdef _DEBUG + String::UL_HTML|String::UL_OPTIMIZE_BIT +#else + cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS +#endif + , true /* status_allowed */); // some root-controlled location @@ -350,49 +388,21 @@ void call_real_parser_handler__do_SEH( #endif } -void report_error(const char *prefix, const char *body, bool header_only) { - if(!body) - body=""; - - // log it - SAPI::log(pool, "%s%s", prefix?prefix:"", body); - - // - int content_length=strlen(body); - - // prepare header - SAPI::add_header_attribute(pool, "content-type", "text/plain"); - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); - SAPI::add_header_attribute(pool, "content-length", content_length_cstr); - - // send header - SAPI::send_header(pool); - - // body - if(!header_only) - SAPI::send_body(pool, body, content_length); -} - -#ifdef WIN32 +#if _MSC_VER int failed_new(size_t size) { - const char *msg="out of memory"; - report_error(0, msg, false/*header_only*/); - SAPI::die(msg); + SAPI::die("out of memory in 'new', failed to allocated %u bytes", size); return 0; // not reached } #endif #ifdef HAVE_SET_NEW_HANDLER void failed_new() { - const char *msg="out of memory"; - report_error(0, msg, false/*header_only*/); - SAPI::die(msg); + SAPI::die("out of memory in 'new'"); } #endif int main(int argc, char *argv[]) { - int result; +// _asm int 3; argv0=argv[0]; umask(2); @@ -423,6 +433,14 @@ int main(int argc, char *argv[]) { setmode(fileno(stderr), _O_BINARY); #endif +#if _MSC_VER + _set_new_handler(failed_new); +#endif + +#ifdef HAVE_SET_NEW_HANDLER + std::set_new_handler(failed_new); +#endif + char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; #ifdef WIN32 back_slashes_to_slashes(filespec_to_process); @@ -432,36 +450,19 @@ int main(int argc, char *argv[]) { const char *request_method=getenv("REQUEST_METHOD"); bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; -#ifdef WIN32 - _set_new_handler(failed_new); -#endif - -#ifdef HAVE_SET_NEW_HANDLER - std::set_new_handler(failed_new); -#endif - try { // global try call_real_parser_handler__do_SEH( filespec_to_process, request_method, header_only); - - // successful finish - result=0; } 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 - report_error("exception in request exception handler: ", e.comment(), header_only); - - // unsuccessful finish - result=1; -#if _MSC_VER && !defined(_DEBUG) + SAPI::die("exception in request exception handler: %s", e.comment()); +#ifndef _DEBUG } catch(...) { - report_error(0, "", header_only); - - // unsuccessful finish - result=1; + SAPI::die(""); #endif } @@ -471,5 +472,5 @@ int main(int argc, char *argv[]) { if(!cgi) SAPI::send_body(pool, "\n", 1); #endif - return result; + return 0; }