--- parser3/src/targets/cgi/parser3.C	2001/04/23 13:29:53	1.71
+++ parser3/src/targets/cgi/parser3.C	2001/04/28 15:22:47	1.76
@@ -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.76 2001/04/28 15:22:47 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -15,8 +15,8 @@
 #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"
@@ -173,6 +173,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 +230,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 +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