--- parser3/src/targets/cgi/parser3.C 2001/04/09 14:02:05 1.60 +++ parser3/src/targets/cgi/parser3.C 2001/05/15 11:36:15 1.78 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.60 2001/04/09 14:02:05 paf Exp $ + $Id: parser3.C,v 1.78 2001/05/15 11:36:15 parser Exp $ */ #include "pa_config_includes.h" @@ -14,18 +14,12 @@ # include #endif -#include -#include -#include -#include -#include - #include "pa_sapi.h" +#include "classes.h" #include "pa_common.h" -#include "pa_globals.h" #include "pa_request.h" #include "pa_socks.h" -#include "pa_exec.h" +#include "pa_version.h" /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M @@ -55,6 +49,39 @@ static LONG WINAPI TopLevelExceptionFilt #endif // SAPI +// appends to parser3.log located beside my binary +void SAPI::log(Pool& pool, const char *fmt, ...) { + bool opened; + FILE *f=0; + + if(argv0) { + // beside by binary + char file_spec[MAX_STRING]; + strncpy(file_spec, argv0, MAX_STRING); // filespec of my binary + rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename + strcat(file_spec, "/parser3.log"); + f=fopen(file_spec, "at"); + } + opened=f!=0; + if(!opened) + f=stderr; + + // prefix + time_t t=time(0); + const char *stamp=ctime(&t); + fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp); + // message + va_list args; + va_start(args,fmt); + vfprintf(f, fmt, args); + va_end(args); + // newline + fprintf(f, "\n"); + + if(opened) + fclose(f); +} + const char *SAPI::get_env(Pool& pool, const char *name) { return getenv(name); } @@ -91,46 +118,6 @@ void SAPI::send_body(Pool& pool, const v stdout_write(buf, size); } -// appends to parser3.log located beside my binary -void SAPI::log(Pool& pool, const char *fmt, ...) { - bool opened; - FILE *f=0; - - if(argv0) { - // beside by binary - char file_spec[MAX_STRING]; - strncpy(file_spec, argv0, MAX_STRING); // filespec of my binary - rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename - strcat(file_spec, "/parser3.log"); - f=fopen(file_spec, "at"); - } - opened=f!=0; - if(!opened) - f=stderr; - - // prefix - time_t t=time(0); - const char *stamp=ctime(&t); - fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp); - // message - va_list args; - va_start(args,fmt); - vfprintf(f, fmt, args); - va_end(args); - // newline - fprintf(f, "\n"); - - if(opened) - fclose(f); -} - -int SAPI::execute(const String& file_spec, - const Hash *env, - const Array *argv, - const String& in, String& out, String& err) { - return pa_exec(file_spec, env, argv, in, out, err); -} - /** main workhorse @@ -159,8 +146,14 @@ int main(int argc, char *argv[]) { if(!cgi) { if(argc<2) { - printf("Usage: %s \n", argv0?argv0:"parser3"); - exit(1); + printf( + "Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)\n" + "Author: Alexander Petrosyan (http://design.ru/paf)\n" + "\n" + "Usage: %s \n", + PARSER_VERSION, + argv0?argv0:"parser3"); + return 1; } } @@ -175,19 +168,20 @@ int main(int argc, char *argv[]) { // must be first in PTRY{}PCATCH #ifdef WIN32 SetUnhandledExceptionFilter(&TopLevelExceptionFilter); - //TODO: initSocks(); #endif - // + // init socks init_socks(pool); + // init global classes + init_methoded_array(pool); // init global variables pa_globals_init(pool); if(!filespec_to_process) PTHROW(0, 0, 0, - "no file to process"); + "Parser/%s", PARSER_VERSION); // Request info Request::Info request_info; @@ -208,14 +202,16 @@ int main(int argc, char *argv[]) { } else { static char buf[MAX_STRING]; strncpy(buf, filespec_to_process, MAX_STRING); - rsplit(buf, '/'); rsplit(buf, '\\');// strip filename - request_info.document_root=buf; + if(rsplit(buf, '/') || rsplit(buf, '\\')) // strip filename + request_info.document_root=buf; + else + request_info.document_root=""; } request_info.path_translated=filespec_to_process; request_info.method=request_method; const char *query_string=SAPI::get_env(pool, "QUERY_STRING"); request_info.query_string=query_string; - if(cgi) + if(cgi) { if(const char *env_request_uri=SAPI::get_env(pool, "REQUEST_URI")) request_info.uri=env_request_uri; else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) @@ -233,7 +229,17 @@ int main(int argc, char *argv[]) { PTHROW(0, 0, 0, "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); - else + + 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 + PTHROW(0, 0, + 0, + "CGI: illegal call"); + } + } else request_info.uri=0; request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE"); @@ -245,7 +251,7 @@ int main(int argc, char *argv[]) { // prepare to process request Request request(pool, request_info, - 1||cgi ? String::UL_HTML_TYPO : String::UL_CLEAN + cgi ? String::UL_USER_HTML : String::UL_AS_IS ); // some root-controlled location @@ -255,7 +261,7 @@ int main(int argc, char *argv[]) { GetWindowsDirectory(root_auto_path, MAX_STRING); #else // ~nobody todo: figure out a better place - char *root_auto_path=SAPI::get_env(pool, "HOME"); + const char *root_auto_path=SAPI::get_env(pool, "HOME"); #endif // beside by binary @@ -272,6 +278,9 @@ int main(int argc, char *argv[]) { // done_socks(); + extern void log_pool_stats(Pool& pool); + log_pool_stats(pool); + // must be last in PTRY{}PCATCH #ifdef WIN32 SetUnhandledExceptionFilter(0);