--- parser3/src/classes/file.C	2001/10/29 14:13:14	1.62
+++ parser3/src/classes/file.C	2001/10/31 14:01:44	1.64
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: file.C,v 1.62 2001/10/29 14:13:14 paf Exp $
+	$Id: file.C,v 1.64 2001/10/31 14:01:44 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -189,8 +189,7 @@ static void _exec_cgi(Request& r, const
 		}
 
 	// const
-	String gateway_interface(pool, "CGI/1.1");
-	env.put(String(pool, "GATEWAY_INTERFACE"), &gateway_interface);
+	ECSTR(GATEWAY_INTERFACE, "CGI/1.1");
 	// from Request.info
 	ECSTR(DOCUMENT_ROOT, r.info.document_root);
 	ECSTR(PATH_TRANSLATED, r.info.path_translated);
@@ -212,7 +211,7 @@ static void _exec_cgi(Request& r, const
 	EPASS(REMOTE_HOST);
 	EPASS(REMOTE_USER);
 	// SCRIPT_NAME
-	env.put(String(pool, "SCRIPT_NAME"), &script_name);
+	env.put(*new(pool) String(pool, "SCRIPT_NAME"), &script_name);
 #ifdef WIN32
 	// WIN32 shell
 	EPASS(COMSPEC);
@@ -272,7 +271,7 @@ static void _exec_cgi(Request& r, const
 		}
 	}
 	// body
-	self.set(false/*not tainted*/, body->cstr(String::UL_AS_IS), body->size());
+	self.set(false/*not tainted*/, body->cstr(), body->size());
 
 	// $status
 	self.fields().put(
@@ -307,7 +306,7 @@ static void _list(Request& r, const Stri
 	if(params->size()>1) {
 		regexp=&params->as_no_junction(1, "regexp must not be code").as_string();
 
-		const char *pattern=regexp->cstr(String::UL_AS_IS);
+		const char *pattern=regexp->cstr();
 		const char *errptr;
 		int erroffset;
 		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL,