--- parser3/src/targets/cgi/parser3.C	2001/04/23 13:29:53	1.71
+++ parser3/src/targets/cgi/parser3.C	2001/05/21 08:05:52	1.89
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.71 2001/04/23 13:29:53 paf Exp $
+	$Id: parser3.C,v 1.89 2001/05/21 08:05:52 parser Exp $
 */
 
 #include "pa_config_includes.h"
@@ -15,12 +15,15 @@
 #endif
 
 #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 
 
@@ -49,7 +52,8 @@ static LONG WINAPI TopLevelExceptionFilt
 #endif
 
 // SAPI
-// appends to parser3.log located beside my binary
+
+// 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;
@@ -80,6 +84,8 @@ void SAPI::log(Pool& pool, const char *f
 
 	if(opened)
 		fclose(f);
+	else
+		fflush(f);
 }
 
 const char *SAPI::get_env(Pool& pool, const char *name) {
@@ -173,6 +179,8 @@ int main(int argc, char *argv[]) {
 		// init socks
 		init_socks(pool);
 
+		// init global classes
+		init_methoded_array(pool);
 		// init global variables
 		pa_globals_init(pool);
 
@@ -228,12 +236,15 @@ int main(int argc, char *argv[]) {
 					0,
 					"CGI: no PATH_INFO defined(in reinventing REQUEST_URI)");
 
-			const char *script_name=SAPI::get_env(pool, "SCRIPT_NAME");
-			if(script_name &&
-				strncmp(request_info.uri,script_name, strlen(script_name))==0)
-				PTHROW(0, 0,
-					0,
-					"CGI: illegal call");
+			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;
 
@@ -246,7 +257,7 @@ int main(int argc, char *argv[]) {
 		// prepare to process request
 		Request request(pool,
 			request_info,
-			cgi ? String::UL_HTML_TYPO : String::UL_AS_IS
+			cgi ? String::UL_USER_HTML : String::UL_AS_IS
 			);
 		
 		// some root-controlled location
@@ -261,8 +272,13 @@ int main(int argc, char *argv[]) {
 		
 		// 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(
@@ -273,6 +289,11 @@ int main(int argc, char *argv[]) {
 		//
 		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);