--- parser3/src/targets/cgi/parser3.C	2001/03/15 09:37:56	1.13
+++ parser3/src/targets/cgi/parser3.C	2001/03/16 12:30:25	1.15
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: parser3.C,v 1.13 2001/03/15 09:37:56 paf Exp $
+	$Id: parser3.C,v 1.15 2001/03/16 12:30:25 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
 Pool pool; // global pool
 
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 // intercept global system errors
 LONG WINAPI TopLevelExceptionFilter (
 									 struct _EXCEPTION_POINTERS *ExceptionInfo
@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) {
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 		SetUnhandledExceptionFilter(&TopLevelExceptionFilter);
 		//TODO: initSocks();
 #	endif
@@ -126,9 +126,9 @@ int main(int argc, char *argv[]) {
 		}
 		request_info.document_root=document_root;
 		request_info.path_translated=filespec_to_process;
-		request_info.request_method=getenv("REQUEST_METHOD");
+		request_info.method=getenv("REQUEST_METHOD");
 		request_info.query_string=getenv("QUERY_STRING");
-		request_info.request_uri=getenv("REQUEST_URI");
+		request_info.uri=getenv("REQUEST_URI");
 		request_info.content_type=getenv("CONTENT_TYPE");
 		const char *content_length=getenv("CONTENT_LENGTH");
 		request_info.content_length=(content_length?atoi(content_length):0);
@@ -166,7 +166,7 @@ int main(int argc, char *argv[]) {
 
 		// must be last in PTRY{}PCATCH
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 		SetUnhandledExceptionFilter(0);
 #	endif
 #endif