--- parser3/src/targets/cgi/parser3.C	2001/04/20 14:18:52	1.67
+++ parser3/src/targets/cgi/parser3.C	2001/05/15 11:36:15	1.78
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.67 2001/04/20 14:18:52 paf Exp $
+	$Id: parser3.C,v 1.78 2001/05/15 11:36:15 parser Exp $
 */
 
 #include "pa_config_includes.h"
@@ -15,12 +15,11 @@
 #endif
 
 #include "pa_sapi.h"
+#include "classes.h"
 #include "pa_common.h"
-#include "pa_globals.h"
 #include "pa_request.h"
 #include "pa_socks.h"
-
-/// @test disable /cgi-bin/parser3/auto.p
+#include "pa_version.h"
 
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
@@ -101,7 +100,7 @@ size_t SAPI::read_post(Pool& pool, char
 }
 
 void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) {
-	if(1||cgi)
+	if(cgi)
 		printf("%s: %s\n", key, value);
 }
 
@@ -147,7 +146,13 @@ int main(int argc, char *argv[]) {
 	
 	if(!cgi) {
 		if(argc<2) {
-			printf("Usage: %s <file>\n", argv0?argv0:"parser3");
+			printf(
+				"Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)\n"
+				"Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)\n"
+				"\n"
+				"Usage: %s <file>\n",
+				PARSER_VERSION, 
+				argv0?argv0:"parser3");
 			return 1;
 		}
 	}
@@ -168,13 +173,15 @@ 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);
 
 		if(!filespec_to_process)
 			PTHROW(0, 0,
 				0,
-				"no file to process");
+				"Parser/%s", PARSER_VERSION);
 
 		// Request info
 		Request::Info request_info;
@@ -195,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"))
@@ -220,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");
@@ -232,7 +251,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
@@ -259,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);