--- parser3/src/targets/cgi/parser3.C	2002/04/04 07:57:50	1.166
+++ parser3/src/targets/cgi/parser3.C	2002/05/06 10:53:53	1.178
@@ -4,7 +4,7 @@
 	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: parser3.C,v 1.166 2002/04/04 07:57:50 paf Exp $
+	$Id: parser3.C,v 1.178 2002/05/06 10:53:53 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -41,6 +41,7 @@ extern ulong
 
 // consts
 
+#ifndef _PROFILE
 extern const char *main_RCSIds[];
 #ifdef USE_SMTP
 extern const char *smtp_RCSIds[];
@@ -60,16 +61,17 @@ const char **RCSIds[]={
 	parser3_RCSIds,
 	0
 };
+#endif
 
-const char *PARSER_ROOT_CONFIG_ENV_NAME="HTTP_PARSER_ROOT_CONFIG";
-const char *PARSER_SITE_CONFIG_ENV_NAME="HTTP_PARSER_SITE_CONFIG";
+#define REDIRECT_PREFIX "REDIRECT_"
+#define PARSER_ROOT_CONFIG_ENV_NAME "HTTP_PARSER_ROOT_CONFIG"
+#define PARSER_SITE_CONFIG_ENV_NAME "HTTP_PARSER_SITE_CONFIG"
 
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
 
 const char *argv0;
-Pool_storage pool_storage;
-Pool pool(&pool_storage); // global pool [dont describe to doxygen: it confuses it with param names]
+Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names]
 bool cgi; ///< we were started as CGI?
 
 // SAPI
@@ -92,8 +94,10 @@ static void log(const char *fmt, va_list
 
 	// prefix
 	time_t t=time(0);
-	const char *stamp=ctime(&t);
-	fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp);
+	if(const char *stamp=ctime(&t)) { // never saw that
+		if(size_t len=strlen(stamp)) // saw once stamp being =""
+			fprintf(f, "[%.*s] ", len-1, stamp);
+	}
 	// message
 
 	char buf[MAX_STRING];
@@ -121,7 +125,7 @@ void SAPI::log(Pool& , const char *fmt,
 void SAPI::die(const char *fmt, ...) {
 #ifdef DEBUG_POOL_MALLOC
 	extern void log_pool_stats(Pool& pool);
-	log_pool_stats(pool);
+	log_pool_stats(*pool);
 #endif
 
     va_list args;
@@ -142,17 +146,17 @@ void SAPI::die(const char *fmt, ...) {
 
 	// prepare header
 	// let's be honest, that's bad we couldn't produce valid output
-	SAPI::add_header_attribute(pool, "status", "500");
-	SAPI::add_header_attribute(pool, "content-type", "text/plain");
+	SAPI::add_header_attribute(*pool, "status", "500");
+	SAPI::add_header_attribute(*pool, "content-type", "text/plain");
 	char content_length_cstr[MAX_NUMBER];
-	snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length);
-	SAPI::add_header_attribute(pool, "content-length", content_length_cstr);
+	snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length);
+	SAPI::add_header_attribute(*pool, "content-length", content_length_cstr);
 
 	// send header
-	SAPI::send_header(pool);
+	SAPI::send_header(*pool);
 
 	// body
-	SAPI::send_body(pool, body, content_length);
+	SAPI::send_body(*pool, body, content_length);
 
 	exit(1);
 }
@@ -196,12 +200,19 @@ void SAPI::send_body(Pool& , const void
 //
 
 void full_file_spec(const char *file_name, char *buf, size_t buf_size) {
-	if(file_name && !strchr(file_name, '/')) {
-		char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
-		snprintf(buf, buf_size, "%s/%s", cwd, file_name);
-	} else {
-		strncpy(buf, file_name, buf_size);
-	}
+	if(file_name)
+		if(file_name[0]=='/' 
+#ifdef WIN32
+			|| (file_name[0] && file_name[1]==':')
+#endif
+			) 
+			strncpy(buf, file_name, buf_size);
+		else {
+			char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
+			snprintf(buf, buf_size, "%s/%s", cwd, file_name);
+		}
+	else
+		buf[0]=0;
 #ifdef WIN32
 	back_slashes_to_slashes(buf);
 #endif
@@ -220,12 +231,12 @@ void real_parser_handler(
 					const char *filespec_to_process,
 					const char *request_method, bool header_only) {
 	// init socks
-	init_socks(pool);
+	init_socks(*pool);
 	
 	// init global classes
-	init_methoded_array(pool);
+	init_methoded_array(*pool);
 	// init global variables
-	pa_globals_init(pool);
+	pa_globals_init(*pool);
 	
 	if(!filespec_to_process)
 		SAPI::die("Parser/%s", PARSER_VERSION);
@@ -234,9 +245,9 @@ void real_parser_handler(
 	Request::Info request_info;
 	char document_root_buf[MAX_STRING];
 	if(cgi) {
-		if(const char *env_document_root=SAPI::get_env(pool, "DOCUMENT_ROOT"))
+		if(const char *env_document_root=SAPI::get_env(*pool, "DOCUMENT_ROOT"))
 			request_info.document_root=env_document_root;
-		else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) {
+		else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) {
 			// IIS
 			size_t len=min(sizeof(document_root_buf)-1, strlen(filespec_to_process)-strlen(path_info));
 			memcpy(document_root_buf, filespec_to_process, len); document_root_buf[len]=0;
@@ -251,14 +262,14 @@ void real_parser_handler(
 	}
 	request_info.path_translated=filespec_to_process;
 	request_info.method=request_method ? request_method : "GET";
-	const char *query_string=SAPI::get_env(pool, "QUERY_STRING");
+	const char *query_string=SAPI::get_env(*pool, "QUERY_STRING");
 	request_info.query_string=query_string;
 	if(cgi) {
-		if(const char *env_request_uri=SAPI::get_env(pool, "REQUEST_URI"))
+		if(const char *env_request_uri=SAPI::get_env(*pool, "REQUEST_URI"))
 			request_info.uri=env_request_uri;
-		else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO"))
+		else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO"))
 			if(query_string) {
-				char *reconstructed_uri=(char *)pool.malloc(
+				char *reconstructed_uri=(char *)pool->malloc(
 					strlen(path_info)+1/*'?'*/+
 					strlen(query_string)+1/*0*/);
 				strcpy(reconstructed_uri, path_info);
@@ -274,7 +285,7 @@ void real_parser_handler(
 			
 #ifndef WIN32
 			// they've changed this under IIS5.
-			if(const char *script_name=SAPI::get_env(pool, "SCRIPT_NAME")) {
+			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 &&
@@ -283,16 +294,16 @@ void real_parser_handler(
 			}
 #endif
 	} else
-		request_info.uri=0;
+		request_info.uri="";
 	
-	request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE");
-	const char *content_length=SAPI::get_env(pool, "CONTENT_LENGTH");
+	request_info.content_type=SAPI::get_env(*pool, "CONTENT_TYPE");
+	const char *content_length=SAPI::get_env(*pool, "CONTENT_LENGTH");
 	request_info.content_length=(content_length?atoi(content_length):0);
-	request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE");
-	request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT");
+	request_info.cookie=SAPI::get_env(*pool, "HTTP_COOKIE");
+	request_info.user_agent=SAPI::get_env(*pool, "HTTP_USER_AGENT");
 	
 	// prepare to process request
-	Request request(pool,
+	Request request(*pool,
 		request_info,
 #ifdef _DEBUG
 		String::UL_HTML|String::UL_OPTIMIZE_BIT
@@ -303,33 +314,41 @@ void real_parser_handler(
 		true /* status_allowed */);
 	
 	// some root-controlled location
-	const char *root_config_filespec;
-	if(const char *root_config_by_env=getenv(PARSER_ROOT_CONFIG_ENV_NAME))
-		root_config_filespec=root_config_by_env;
+	const char *root_config_filespec_cstr;
+	char root_config_filespec_buf[MAX_STRING];
+	const char *root_config_by_env=getenv(PARSER_ROOT_CONFIG_ENV_NAME);
+	if(!root_config_by_env)
+		root_config_by_env=getenv(REDIRECT_PREFIX PARSER_ROOT_CONFIG_ENV_NAME);
+	if(root_config_by_env)
+		root_config_filespec_cstr=root_config_by_env;
 	else {
 #ifdef ROOT_CONFIG_DIR
-		root_config_filespec=ROOT_CONFIG_DIR "/" CONFIG_FILE_NAME;
+		root_config_filespec_cstr=ROOT_CONFIG_DIR "/" CONFIG_FILE_NAME;
 #else
 #	ifdef WIN32
 		// c:\windows
 		char windows_dir[MAX_STRING];
 		GetWindowsDirectory(windows_dir, MAX_STRING);
 
-		char buf[MAX_STRING];
-		snprintf(buf, MAX_STRING, 
+		
+		snprintf(root_config_filespec_buf, MAX_STRING, 
 			"%s/%s", 
 			windows_dir, CONFIG_FILE_NAME);
 		
-		root_config_filespec=buf;
+		root_config_filespec_cstr=root_config_filespec_buf;
 #	else
 #error must be compiled either configure/make or MSVC++
 #	endif
 #endif
 	}
 	
-	const char *site_config_filespec;
-	if(const char *site_config_by_env=getenv(PARSER_SITE_CONFIG_ENV_NAME))
-		site_config_filespec=site_config_by_env;
+	const char *site_config_filespec_cstr;
+	char site_config_filespec_buf[MAX_STRING];
+	const char *site_config_by_env=getenv(PARSER_SITE_CONFIG_ENV_NAME);
+	if(!site_config_by_env)
+		site_config_by_env=getenv(REDIRECT_PREFIX PARSER_SITE_CONFIG_ENV_NAME);
+	if(site_config_by_env)
+		site_config_filespec_cstr=site_config_by_env;
 	else {
 	// beside by binary
 	// @todo full path, not ./!
@@ -341,17 +360,16 @@ void real_parser_handler(
 			// no path, just filename
 			beside_binary_path[0]='.'; beside_binary_path[1]=0;
 		}
-		char buf[MAX_STRING];
-		snprintf(buf, MAX_STRING, 
+		snprintf(site_config_filespec_buf, MAX_STRING, 
 			"%s/%s", 
 			beside_binary_path, CONFIG_FILE_NAME);
-		site_config_filespec=buf;
+		site_config_filespec_cstr=site_config_filespec_buf;
 	}
 	
 	// process the request
 	request.core(
-		root_config_filespec, false /*don't fail_on_read_problem*/,
-		site_config_filespec, false /*don't fail_on_read_problem*/,
+		root_config_filespec_cstr, false /*fail_on_read_problem*/,
+		site_config_filespec_cstr, false /*fail_on_read_problem*/,
 		header_only);
 	
 	//
@@ -359,11 +377,11 @@ void real_parser_handler(
 	
 #ifdef DEBUG_POOL_MALLOC
 	extern void log_pool_stats(Pool& pool);
-	log_pool_stats(pool);
+	log_pool_stats(*pool);
 #endif
 
 #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
-	SAPI::log(pool, 
+	SAPI::log(*pool, 
 		"string piece appends=%lu, wcontext_result_size=%lu, string_string_shortcut_economy_closer=%lu, total_alloc_size=%lu", 
 		string_piece_appends,
 		wcontext_result_size,
@@ -416,6 +434,13 @@ void failed_new() {
 #endif
 
 int main(int argc, char *argv[]) {
+	Pool_storage global_pool_storage;
+	Pool global_pool(&global_pool_storage);
+	pool=&global_pool;
+
+#ifdef _DEBUG
+//	_crtBreakAlloc=33112;
+#endif
 //	_asm int 3;
 	argv0=argv[0];
 
@@ -496,7 +521,7 @@ int main(int argc, char *argv[]) {
 #ifndef WIN32
 	// 
 	if(!cgi)
-		SAPI::send_body(pool, "\n", 1);
+		SAPI::send_body(*pool, "\n", 1);
 #endif
 //_asm int 3;
 	return 0;