--- parser3/src/targets/cgi/parser3.C 2001/04/03 05:23:43 1.52 +++ parser3/src/targets/cgi/parser3.C 2001/08/27 13:27:26 1.97 @@ -4,9 +4,8 @@ Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: parser3.C,v 1.52 2001/04/03 05:23:43 paf Exp $ */ +static const char *RCSId="$Id: parser3.C,v 1.97 2001/08/27 13:27:26 parser Exp $"; #include "pa_config_includes.h" @@ -14,16 +13,15 @@ # 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_version.h" + +//#define DEBUG_POOL_MALLOC + /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M @@ -53,12 +51,48 @@ static LONG WINAPI TopLevelExceptionFilt #endif // SAPI + +// appends to parser3.log located beside my binary if openable, to stderr otherwize +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); + else + fflush(f); +} + const char *SAPI::get_env(Pool& pool, const char *name) { return getenv(name); } -uint SAPI::read_post(Pool& pool, char *buf, uint max_bytes) { - uint read_size=0; +size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) { + size_t read_size=0; do { int chunk_size=read(fileno(stdin), buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); @@ -75,7 +109,7 @@ void SAPI::add_header_attribute(Pool& po printf("%s: %s\n", key, value); } -/// @todo parser4: intelligent cache-control +/// @todo intelligent cache-control void SAPI::send_header(Pool& pool) { if(cgi) { puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); @@ -85,47 +119,26 @@ void SAPI::send_header(Pool& pool) { } } -void SAPI::send_body(Pool& pool, const char *buf, size_t size) { +void SAPI::send_body(Pool& pool, const void *buf, size_t size) { 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"); +char *full_file_spec(char *file_name) { + if(!strchr(file_name, '/')) { + static char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); + static char buf[MAX_STRING]; + snprintf(buf, MAX_STRING, "%s/%s", cwd, file_name); + return buf; } - 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); + return file_name; } /** main workhorse - @todo parser4: + @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. @@ -150,8 +163,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; } } @@ -159,6 +178,7 @@ int main(int argc, char *argv[]) { #ifdef WIN32 back_slashes_to_slashes(filespec_to_process); #endif + filespec_to_process=full_file_spec(filespec_to_process); const char *request_method=getenv("REQUEST_METHOD"); bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; @@ -166,16 +186,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; @@ -196,14 +220,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")) @@ -221,7 +247,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"); @@ -233,7 +269,7 @@ int main(int argc, char *argv[]) { // prepare to process request Request request(pool, request_info, - cgi ? String::UL_HTML_TYPO : String::UL_CLEAN + cgi ? String::UL_USER_HTML : String::UL_AS_IS ); // some root-controlled location @@ -243,13 +279,18 @@ 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 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 + strncpy(site_auto_path, argv0, MAX_STRING); // filespec of my binary + if(!( + rsplit(site_auto_path, '/') || + rsplit(site_auto_path, '\\'))) { // strip filename + // no path, just filename + site_auto_path[0]='.'; site_auto_path[1]=0; + } // process the request request.core( @@ -257,10 +298,22 @@ int main(int argc, char *argv[]) { site_auto_path, false, header_only); + // + done_socks(); + +#ifdef DEBUG_POOL_MALLOC + extern void log_pool_stats(Pool& pool); + log_pool_stats(pool); +#endif + // must be last in PTRY{}PCATCH #ifdef WIN32 SetUnhandledExceptionFilter(0); #endif + // + if(!cgi) + SAPI::send_body(pool, "\n", 1); + // successful finish return 0; } PCATCH(e) { // global problem @@ -282,7 +335,7 @@ int main(int argc, char *argv[]) { // prepare header SAPI::add_header_attribute(pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); SAPI::add_header_attribute(pool, "content-length", content_length_cstr); // send header @@ -292,6 +345,10 @@ int main(int argc, char *argv[]) { if(!header_only) SAPI::send_body(pool, body, content_length); + // + if(!cgi) + SAPI::send_body(pool, "\n", 1); + // unsuccessful finish return 1; }