--- parser3/src/classes/file.C	2001/09/14 15:41:59	1.53
+++ parser3/src/classes/file.C	2001/10/29 17:49:57	1.63
@@ -2,12 +2,10 @@
 	Parser: @b file parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: file.C,v 1.53 2001/09/14 15:41:59 parser Exp $
+	$Id: file.C,v 1.63 2001/10/29 17:49:57 paf Exp $
 */
-static const char *RCSId="$Id: file.C,v 1.53 2001/09/14 15:41:59 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -122,7 +120,8 @@ static void _load(Request& r, const Stri
 	file_read(pool, r.absolute(lfile_name), data, size, 
 		vmode_name.as_string()==TEXT_MODE_NAME);
 
-	char *user_file_name=params->size()>2?params->get(2).as_string().cstr()
+	char *user_file_name=params->size()>2?
+		params->as_string(2, "filename must be string").cstr(String::UL_FILE_SPEC)
 		:lfile_name.cstr(String::UL_FILE_SPEC);
 	
 	static_cast<VFile *>(r.self)->set(true/*tainted*/, data, size, 
@@ -162,7 +161,9 @@ static void pass_cgi_header_attribute(Ar
 		hash.put(string.mid(0, colon_pos), 
 		new(string.pool()) VString(string.mid(colon_pos+1, string.size())));
 }
-/// @todo fix `` in perl - they produced flipping consoles and no output to perl
+/** @todo fix `` in perl - they produced flipping consoles and no output to perl
+	@test EPASS, ECSTR [touched them when optimized hash]
+*/
 static void _exec_cgi(Request& r, const String& method_name, MethodParams *params,
 					  bool cgi) {
 	Pool& pool=r.pool();
@@ -172,52 +173,53 @@ static void _exec_cgi(Request& r, const
 	const String& script_name=r.absolute(vfile_name.as_string());
 
 	Hash env(pool);
-	#define PASS(key) \
-		String key(pool); \
-		if(const char *value=SAPI::get_env(pool, #key)) { \
-			key.APPEND_CONST(value); \
-			env.put(String(pool, #key), &key); \
+	#define ECSTR(name, value_cstr) \
+		String name##key(pool, #name); \
+		String name##value(pool); \
+		if(value_cstr) { \
+			name##value.APPEND_CONST(value_cstr); \
+			env.put(name##key, &name##value); \
 		}
-	#define INFO(key, value) \
-		String value(pool); \
-		if(r.info.value) { \
-			value.APPEND_CONST(r.info.value); \
-			env.put(String(pool, key), &value); \
+	#define EPASS(name) \
+		String name##key(pool, #name); \
+		String name##value(pool); \
+		if(const char *value_cstr=SAPI::get_env(pool, #name)) { \
+			name##value.APPEND_CONST(value_cstr); \
+			env.put(name##key, &name##value); \
 		}
 
 	// 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
-	INFO("DOCUMENT_ROOT", document_root);
-	INFO("PATH_TRANSLATED", path_translated);
-	INFO("SERVER_PROTOCOL", method);
-	INFO("QUERY_STRING", query_string);
-	INFO("REQUEST_URI", uri);
-	INFO("CONTENT_TYPE", content_type);
+	ECSTR(DOCUMENT_ROOT, r.info.document_root);
+	ECSTR(PATH_TRANSLATED, r.info.path_translated);
+	ECSTR(SERVER_PROTOCOL, r.info.method);
+	ECSTR(QUERY_STRING, r.info.query_string);
+	ECSTR(REQUEST_URI, r.info.uri);
+	ECSTR(CONTENT_TYPE, r.info.content_type);
 	char content_length_cstr[MAX_NUMBER];  
 	snprintf(content_length_cstr, MAX_NUMBER, "%u", r.info.content_length);
 	String content_length(pool, content_length_cstr);
-	env.put(String(pool, "CONTENT_LENGTH"), &content_length);
-	INFO("HTTP_COOKIE", cookie);
-	INFO("HTTP_USER_AGENT", user_agent);
+	ECSTR(CONTENT_LENGTH, content_length_cstr);
+	ECSTR(HTTP_COOKIE, r.info.cookie);
+	ECSTR(HTTP_USER_AGENT, r.info.user_agent);
 	// passing some SAPI:get_env-s
-	PASS(SERVER_NAME);
-	PASS(SERVER_PORT);
-	PASS(HTTP_REFERER);
-	PASS(REMOTE_ADDR);
-	PASS(REMOTE_HOST);
-	PASS(REMOTE_USER);
+	EPASS(SERVER_NAME);
+	EPASS(SERVER_PORT);
+	EPASS(HTTP_REFERER);
+	EPASS(REMOTE_ADDR);
+	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
-	PASS(COMSPEC);
+	EPASS(COMSPEC);
 #endif
 
 	if(params->size()>1) {
 		Value& venv=params->as_no_junction(1, "env must not be code");
-		if(Hash *user_env=venv.get_hash())
+		if(Hash *user_env=venv.get_hash(&method_name))
 			user_env->for_each(append_env_pair, &env);
 	}
 
@@ -225,10 +227,11 @@ static void _exec_cgi(Request& r, const
 	if(params->size()>2) {
 		argv=new(pool) Array(pool, params->size()-2);
 		for(int i=2; i<params->size(); i++)
-			*argv+=&params->get(i).as_string();
+			*argv+=&params->as_string(i, "parameter must be string");
 	}
 
-	const String in(pool, r.post_data, r.post_size);
+	String in(pool);
+	in.APPEND(r.post_data, r.post_size, String::UL_CLEAN, "passing post data", 0);
 	String out(pool);
 	//out.APPEND_CONST("content-type:text/plain\nheader:test-header\n\ntest-body");
 	//out<<in;
@@ -249,7 +252,7 @@ static void _exec_cgi(Request& r, const
 		}
 		if(pos<0) {
 			delim_size=0; // calm down, compiler
-			PTHROW(0, 0,
+			throw Exception(0, 0,
 				&method_name,
 				"output does not contain CGI header; exit code=%d; outsize=%u; out: \"%s\"; errsize=%u; err: \"%s\"", 
 					status, 
@@ -308,10 +311,10 @@ static void _list(Request& r, const Stri
 		int erroffset;
 		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
 			&errptr, &erroffset, 
-			r.pcre_tables);
+			r.pcre_tables());
 
 		if(!regexp_code)
-			PTHROW(0, 0, 
+			throw Exception(0, 0, 
 				&regexp->mid(erroffset, regexp->size()), 
 				"regular expression syntax error - %s", errptr);
 
@@ -339,7 +342,7 @@ static void _list(Request& r, const Stri
 				suits=false;
 			else if(exec_result<0) {
 				(*pcre_free)(regexp_code);
-				PTHROW(0, 0, 
+				throw Exception(0, 0, 
 					regexp, 
 					"regular expression execute (%d)", 
 						exec_result);
@@ -362,6 +365,7 @@ static void _list(Request& r, const Stri
 	if(regexp_code)
 		(*pcre_free)(regexp_code);
 
+	// write out result
 	VTable& result=*new(pool) VTable(pool, &table);
 	result.set_name(method_name);
 	r.write_no_lang(result);