--- parser3/src/targets/cgi/parser3.C 2001/03/24 19:12:21 1.46 +++ parser3/src/targets/cgi/parser3.C 2001/04/28 15:22:47 1.76 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.46 2001/03/24 19:12:21 paf Exp $ + $Id: parser3.C,v 1.76 2001/04/28 15:22:47 paf Exp $ */ #include "pa_config_includes.h" @@ -14,16 +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_version.h" /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M @@ -53,42 +49,6 @@ static LONG WINAPI TopLevelExceptionFilt #endif // SAPI -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; - do { - int 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; - } while(read_size\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; } } @@ -166,23 +168,27 @@ 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; if(cgi) { - if(const char *env_document_root=getenv("DOCUMENT_ROOT")) + if(const char *env_document_root=SAPI::get_env(pool, "DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char *path_info=getenv("PATH_INFO")) { + else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) { // IIS size_t len=strlen(filespec_to_process)-strlen(path_info); char *buf=(char *)pool.malloc(len+1); @@ -196,17 +202,19 @@ 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=getenv("QUERY_STRING"); + const char *query_string=SAPI::get_env(pool, "QUERY_STRING"); request_info.query_string=query_string; - if(cgi) - if(const char *env_request_uri=getenv("REQUEST_URI")) + 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=getenv("PATH_INFO")) + else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) if(query_string) { char *reconstructed_uri=(char *)malloc( strlen(path_info)+1/*'?'*/+ @@ -221,18 +229,29 @@ 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=getenv("CONTENT_TYPE"); - const char *content_length=getenv("CONTENT_LENGTH"); + request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE"); + const char *content_length=SAPI::get_env(pool, "CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); - request_info.cookie=getenv("HTTP_COOKIE"); + request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE"); + request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT"); // prepare to process request Request request(pool, request_info, - cgi ? String::UL_HTML_TYPO : String::UL_NO + cgi ? String::UL_USER_HTML : String::UL_AS_IS ); // some root-controlled location @@ -242,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=getenv("HOME"); + const char *root_auto_path=SAPI::get_env(pool, "HOME"); #endif // beside by binary @@ -256,6 +275,9 @@ int main(int argc, char *argv[]) { site_auto_path, false, header_only); + // + done_socks(); + // must be last in PTRY{}PCATCH #ifdef WIN32 SetUnhandledExceptionFilter(0); @@ -281,7 +303,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