--- parser3/src/targets/cgi/parser3.C	2001/03/19 15:29:41	1.23
+++ parser3/src/targets/cgi/parser3.C	2001/03/20 18:24:45	1.26.2.2
@@ -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.23 2001/03/19 15:29:41 paf Exp $
+	$Id: parser3.C,v 1.26.2.2 2001/03/20 18:24:45 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -14,15 +14,17 @@
 #ifdef WIN32
 #	include <windows.h>
 #	include <io.h>
+#else
+#	include <unistd.h>
 #endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 
+#include "pa_common.h"
 #include "pa_globals.h"
 #include "pa_request.h"
-#include "pa_common.h"
 
 Pool pool; // global pool
 bool cgi;
@@ -54,6 +56,12 @@ LONG WINAPI TopLevelExceptionFilter (
 	return EXCEPTION_EXECUTE_HANDLER; // never reached
 }
 #	endif
+
+void fix_slashes(char *s) {
+	for(; *s; s++)
+		if(*s=='\\')
+			*s='/';
+}
 #endif
 
 // service funcs
@@ -113,7 +121,10 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	const char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+#ifdef WIN32
+	fix_slashes(filespec_to_process);
+#endif
 
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
@@ -133,7 +144,6 @@ int main(int argc, char *argv[]) {
 				"no file to process");
 
 		// Request info
-		// TODO: ifdef WIN32 flip \\ to /
 		Request::Info request_info;
 		const char *document_root=getenv("DOCUMENT_ROOT");
 		if(!document_root) {
@@ -153,9 +163,10 @@ int main(int argc, char *argv[]) {
 		request_info.cookie=getenv("HTTP_COOKIE");
 
 		// prepare to process request
-		Request request(Pool(),
+		Pool request_pool;
+		Request request(request_pool,
 			request_info,
-			cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO
+			cgi ? String::UL_HTML_TYPO : String::UL_NO
 			);
 		
 		// some root-controlled location
@@ -189,9 +200,9 @@ int main(int argc, char *argv[]) {
 #	if _MSC_VER
 		SetUnhandledExceptionFilter(0);
 #	endif
+#endif
 		// successful finish
 		return 0;
-#endif
 	} PCATCH(e) { // global problem 
 		const char *body=e.comment();
 		int content_length=strlen(body);