--- parser3/src/targets/cgi/parser3.C 2001/03/23 11:07:07 1.39 +++ parser3/src/targets/cgi/parser3.C 2001/03/24 09:24:45 1.43 @@ -1,33 +1,22 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.39 2001/03/23 11:07:07 paf Exp $ + $Id: parser3.C,v 1.43 2001/03/24 09:24:45 paf Exp $ */ -#ifdef HAVE_CONFIG_H -# include "pa_config.h" -#endif - +#include "pa_config_includes.h" #ifdef WIN32 # include -# include -#else -# include #endif -//\ifwin32 #include -//#include -//\endifwin32 - #include #include -#include #include #include "pa_sapi.h" @@ -35,12 +24,15 @@ #include "pa_globals.h" #include "pa_request.h" -Pool pool; // global pool +/// IIS refuses to read bigger chunks +const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M + +Pool pool(0); // global pool [dont describe to doxygen: it confuses it with param names] bool cgi; ///< we were started as CGI? -#if _MSC_VER -// intercept global system errors -static LONG WINAPI TopLevelExceptionFilter (struct _EXCEPTION_POINTERS *ExceptionInfo) { +#ifdef WIN32 +/// global system errors into parser exceptions converter +static LONG WINAPI TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) { char buf[MAX_STRING]; if(ExceptionInfo && ExceptionInfo->ExceptionRecord) { struct _EXCEPTION_RECORD *er=ExceptionInfo->ExceptionRecord; @@ -58,15 +50,6 @@ static LONG WINAPI TopLevelExceptionFilt } #endif -//\if -static void fix_slashes(char *s) { - if(s) - for(; *s; s++) - if(*s=='\\') - *s='/'; -} -//\endif - //@{ /// SAPI funcs decl const char *SAPI::get_env(Pool& pool, const char *name) { @@ -77,7 +60,7 @@ uint SAPI::read_post(Pool& pool, char *b uint read_size=0; do { int chunk_size=read(fileno(stdin), - buf+read_size, min(0x400*0x400, max_bytes-read_size)); + buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); if(chunk_size<0) break; read_size+=chunk_size; @@ -94,7 +77,7 @@ void SAPI::add_header_attribute(Pool& po /// @todo intelligent cache-control void SAPI::send_header(Pool& 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(""); @@ -106,9 +89,14 @@ void SAPI::send_body(Pool& pool, const c } //@} -// main +/** + main workhorse -#include + @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. +*/ int main(int argc, char *argv[]) { umask(2); @@ -135,14 +123,14 @@ int main(int argc, char *argv[]) { char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; #ifdef WIN32 - fix_slashes(filespec_to_process); + back_slashes_to_slashes(filespec_to_process); #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 -#if _MSC_VER +#ifdef WIN32 SetUnhandledExceptionFilter(&TopLevelExceptionFilter); //TODO: initSocks(); #endif @@ -161,16 +149,16 @@ int main(int argc, char *argv[]) { if(const char *env_document_root=getenv("DOCUMENT_ROOT")) request_info.document_root=env_document_root; else if(const char *path_info=getenv("PATH_INFO")) { - // under IIS for sure - static char buf[MAX_STRING]; + // IIS size_t len=strlen(filespec_to_process)-strlen(path_info); - strncpy(buf, filespec_to_process, min(MAX_STRING-1, len)); + char *buf=(char *)pool.malloc(len+1); + strncpy(buf, filespec_to_process, len); buf[len]=0; request_info.document_root=buf; } else PTHROW(0, 0, 0, - "CGI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)"); + "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); } else { static char buf[MAX_STRING]; strncpy(buf, filespec_to_process, MAX_STRING); @@ -179,8 +167,29 @@ int main(int argc, char *argv[]) { } request_info.path_translated=filespec_to_process; request_info.method=request_method; - request_info.query_string=getenv("QUERY_STRING"); - request_info.uri=getenv("REQUEST_URI"); + const char *query_string=getenv("QUERY_STRING"); + request_info.query_string=query_string; + if(cgi) + if(const char *env_request_uri=getenv("REQUEST_URI")) + request_info.uri=env_request_uri; + else if(const char *path_info=getenv("PATH_INFO")) + if(query_string) { + char *reconstructed_uri=(char *)malloc( + strlen(path_info)+1/*'?'*/+ + strlen(query_string)+1/*0*/); + strcpy(reconstructed_uri, path_info); + strcat(reconstructed_uri, "?"); + strcat(reconstructed_uri, query_string); + request_info.uri=reconstructed_uri; + } else + request_info.uri=path_info; + else + PTHROW(0, 0, + 0, + "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); + else + request_info.uri=0; + request_info.content_type=getenv("CONTENT_TYPE"); const char *content_length=getenv("CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); @@ -198,7 +207,7 @@ int main(int argc, char *argv[]) { static char root_auto_path[MAX_STRING]; GetWindowsDirectory(root_auto_path, MAX_STRING); #else - // ~nobody + // ~nobody todo: figure out a better place char *root_auto_path=getenv("HOME"); #endif @@ -214,12 +223,17 @@ int main(int argc, char *argv[]) { header_only); // must be last in PTRY{}PCATCH -#if _MSC_VER +#ifdef WIN32 SetUnhandledExceptionFilter(0); #endif // successful finish return 0; } PCATCH(e) { // global problem + // must be first in PCATCH{} +#ifdef WIN32 + SetUnhandledExceptionFilter(0); +#endif + const char *body=e.comment(); int content_length=strlen(body);