--- parser3/src/targets/cgi/parser3.C 2001/03/21 16:59:07 1.29 +++ parser3/src/targets/cgi/parser3.C 2001/03/23 10:27:32 1.37 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.29 2001/03/21 16:59:07 paf Exp $ + $Id: parser3.C,v 1.37 2001/03/23 10:27:32 paf Exp $ */ #ifdef HAVE_CONFIG_H @@ -30,6 +30,7 @@ #include #include +#include "pa_sapi.h" #include "pa_common.h" #include "pa_globals.h" #include "pa_request.h" @@ -37,23 +38,15 @@ Pool pool; // global pool bool cgi; ///< we were started as CGI? -#ifdef WIN32 -# if _MSC_VER +#if defined(WIN32) && _MSC_VER // intercept global system errors -LONG WINAPI TopLevelExceptionFilter ( - struct _EXCEPTION_POINTERS *ExceptionInfo - ) { +static LONG WINAPI TopLevelExceptionFilter (struct _EXCEPTION_POINTERS *ExceptionInfo) { char buf[MAX_STRING]; if(ExceptionInfo && ExceptionInfo->ExceptionRecord) { - struct _EXCEPTION_RECORD *r=ExceptionInfo->ExceptionRecord; - - int printed=0; - printed+=snprintf(buf+printed, MAX_STRING-printed, "Exception 0x%X at 0x%p", - r->ExceptionCode, - r->ExceptionAddress); - for(unsigned int i=0; iNumberParameters; i++) - printed+=snprintf(buf+printed, MAX_STRING-printed, ", 0x%X", - r->ExceptionInformation[i]); + struct _EXCEPTION_RECORD *er=ExceptionInfo->ExceptionRecord; + snprintf(buf, MAX_STRING, "Exception %#X at %p", + er->ExceptionCode, + er->ExceptionAddress); } else strcpy(buf, "Exception "); @@ -63,12 +56,10 @@ LONG WINAPI TopLevelExceptionFilter ( return EXCEPTION_EXECUTE_HANDLER; // never reached } -# endif - #endif //\if -void fix_slashes(char *s) { +static void fix_slashes(char *s) { if(s) for(; *s; s++) if(*s=='\\') @@ -76,17 +67,17 @@ void fix_slashes(char *s) { } //\endif -// service funcs - -const char *get_env(Pool& pool, const char *name) { +//@{ +/// SAPI funcs decl +const char *SAPI::get_env(Pool& pool, const char *name) { return getenv(name); } -int read_post(char *buf, int max_bytes) { - int read_size=0; +uint SAPI::read_post(Pool& pool, char *buf, uint max_bytes) { + uint read_size=0; do { - int chunk_size=read - (fileno(stdin), buf+read_size, min(0x400*0x400, max_bytes-read_size)); + int chunk_size=read(fileno(stdin), + buf+read_size, min(0x400*0x400, max_bytes-read_size)); if(chunk_size<0) break; read_size+=chunk_size; @@ -95,34 +86,37 @@ int read_post(char *buf, int max_bytes) return read_size; } -void output_header_attribute(const char *key, const char *value) { +void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) { if(cgi) printf("%s: %s\n", key, value); } -void output_body(const char *buf, size_t size) { - if(cgi) // header | body delimiter +/// @todo intelligent cache-control +void SAPI::send_header(Pool& pool) { + if(cgi) { + puts("Expires: Fri, 23 Mar 2001 09:32:23 GMT"); + + // header | body delimiter puts(""); + } +} +void SAPI::send_body(Pool& pool, const char *buf, size_t size) { stdout_write(buf, size); } +//@} // main int main(int argc, char *argv[]) { - // TODO:umask(2); -//\#ifdef WIN32 + umask(2); + +#ifdef WIN32 setmode(fileno(stdin), _O_BINARY); setmode(fileno(stdout), _O_BINARY); setmode(fileno(stderr), _O_BINARY); -//\#endif +#endif - // Service funcs - service_funcs.get_env=get_env; - service_funcs.read_post=read_post; - service_funcs.output_header_attribute=output_header_attribute; - service_funcs.output_body=output_body; - // were we started as CGI? cgi= getenv("SERVER_SOFTWARE") || @@ -139,21 +133,21 @@ int main(int argc, char *argv[]) { } char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; -//\#ifdef WIN32 +#ifdef WIN32 fix_slashes(filespec_to_process); -//\#endif +#endif + const char *request_method=getenv("REQUEST_METHOD"); + bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; PTRY { // global try // must be first in PTRY{}PCATCH -#ifdef WIN32 -# if _MSC_VER +#if defined(WIN32) && _MSC_VER SetUnhandledExceptionFilter(&TopLevelExceptionFilter); //TODO: initSocks(); -# endif #endif // init global variables - globals_init(pool); + pa_globals_init(pool); if(!filespec_to_process) PTHROW(0, 0, @@ -162,16 +156,16 @@ int main(int argc, char *argv[]) { // Request info Request::Info request_info; - const char *document_root=getenv("DOCUMENT_ROOT"); - if(!document_root) { - static char fake_document_root[MAX_STRING]; - strncpy(fake_document_root, filespec_to_process, MAX_STRING); - rsplit(fake_document_root, '/'); rsplit(fake_document_root, '\\');// strip filename - document_root=fake_document_root; + if(cgi) + request_info.document_root=getenv("DOCUMENT_ROOT"); + else { + static char document_root[MAX_STRING]; + strncpy(document_root, filespec_to_process, MAX_STRING); + rsplit(document_root, '/'); rsplit(document_root, '\\');// strip filename + request_info.document_root=document_root; } - request_info.document_root=document_root; request_info.path_translated=filespec_to_process; - request_info.method=getenv("REQUEST_METHOD"); + request_info.method=request_method; request_info.query_string=getenv("QUERY_STRING"); request_info.uri=getenv("REQUEST_URI"); request_info.content_type=getenv("CONTENT_TYPE"); @@ -187,36 +181,29 @@ int main(int argc, char *argv[]) { ); // some root-controlled location - char *sys_auto_path1; #ifdef WIN32 // c:\windows - sys_auto_path1=(char *)pool.malloc(MAX_STRING); - GetWindowsDirectory(sys_auto_path1, MAX_STRING); - strcat(sys_auto_path1, PATH_DELIMITER_STRING); + static char root_auto_path[MAX_STRING]; + GetWindowsDirectory(root_auto_path, MAX_STRING); #else // ~nobody - sys_auto_path1=getenv("HOME"); + char *root_auto_path=getenv("HOME"); #endif // beside by binary - char *sys_auto_path2=(char *)pool.malloc(MAX_STRING); - strncpy(sys_auto_path2, argv[0], MAX_STRING); // filespec of my binary - rsplit(sys_auto_path2, '/'); rsplit(sys_auto_path2, '\\');// strip filename - strcat(sys_auto_path2, PATH_DELIMITER_STRING); + static char site_auto_path[MAX_STRING]; + strncpy(site_auto_path, argv[0], MAX_STRING); // filespec of my binary + rsplit(site_auto_path, '/'); rsplit(site_auto_path, '\\');// strip filename // process the request - request.core(pool.exception(), - sys_auto_path1, - sys_auto_path2); - // no actions with request' data past this point - // request.exception not not handled here, but all - // request' data are associated with it's pool=exception + request.core( + root_auto_path, false, + site_auto_path, false, + header_only); // must be last in PTRY{}PCATCH -#ifdef WIN32 -# if _MSC_VER +#if defined(WIN32) && _MSC_VER SetUnhandledExceptionFilter(0); -# endif #endif // successful finish return 0; @@ -224,15 +211,18 @@ int main(int argc, char *argv[]) { const char *body=e.comment(); int content_length=strlen(body); - // header - (*service_funcs.output_header_attribute)("content-type", "text/plain"); + // prepare header + SAPI::add_header_attribute(pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length); - (*service_funcs.output_header_attribute)("content-length", - content_length_cstr); + snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + SAPI::add_header_attribute(pool, "content-length", content_length_cstr); + + // send header + SAPI::send_header(pool); // body - (*service_funcs.output_body)(body, content_length); + if(!header_only) + SAPI::send_body(pool, body, content_length); // unsuccessful finish return 1;