--- parser3/src/targets/cgi/parser3.C	2001/10/22 16:44:43	1.124
+++ parser3/src/targets/cgi/parser3.C	2002/04/04 07:57:50	1.166
@@ -1,16 +1,19 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
+	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.124 2001/10/22 16:44:43 parser Exp $
+	$Id: parser3.C,v 1.166 2002/04/04 07:57:50 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
-#ifdef WIN32
-#	include <windows.h>
+#if _MSC_VER
+#	include <new.h>
+#	include <crtdbg.h>
+#else
+#	include "pa_config_paths.h"
 #endif
 
 #include "pa_sapi.h"
@@ -19,12 +22,22 @@
 #include "pa_request.h"
 #include "pa_socks.h"
 #include "pa_version.h"
+#include "pool_storage.h"
 
-#ifdef XML
-#include <XalanTransformer/XalanCAPI.h>
+#ifdef WIN32
+#	include <windows.h>
 #endif
 
 //#define DEBUG_POOL_MALLOC
+//#define DEBUG_STRING_APPENDS_VS_EXPANDS
+
+#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
+extern ulong 
+	string_piece_appends, 
+	wcontext_result_size,
+	total_alloc_size,
+	string_string_shortcut_economy;
+#endif
 
 // consts
 
@@ -36,9 +49,6 @@ extern const char *gd_RCSIds[];
 extern const char *classes_RCSIds[];
 extern const char *types_RCSIds[];
 extern const char *parser3_RCSIds[];
-#ifdef XML
-extern const char *xalan_patched_RCSIds[];
-#endif
 const char **RCSIds[]={
 	main_RCSIds,
 #ifdef USE_SMTP
@@ -48,17 +58,18 @@ const char **RCSIds[]={
 	classes_RCSIds,
 	types_RCSIds,
 	parser3_RCSIds,
-#ifdef XML
-	xalan_patched_RCSIds,
-#endif
 	0
 };
 
+const char *PARSER_ROOT_CONFIG_ENV_NAME="HTTP_PARSER_ROOT_CONFIG";
+const char *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 pool(0); // global pool [dont describe to doxygen: it confuses it with param names]
+Pool_storage pool_storage;
+Pool pool(&pool_storage); // global pool [dont describe to doxygen: it confuses it with param names]
 bool cgi; ///< we were started as CGI?
 
 // SAPI
@@ -108,11 +119,41 @@ 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);
+#endif
+
     va_list args;
 	va_start(args,fmt);
+	// log
+
+	// logging is more important than user 
+	// she can cancel download, we'd get SIG_PIPE, 
+	// nothing would be logged then
 	::log(fmt, args);
+
+	// inform user
+
+	char body[MAX_STRING];
+	int content_length=vsnprintf(body, MAX_STRING, fmt, args);
+
 	va_end(args);
 
+	// 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");
+	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);
+
+	// send header
+	SAPI::send_header(pool);
+
+	// body
+	SAPI::send_body(pool, body, content_length);
+
 	exit(1);
 }
 
@@ -125,7 +166,7 @@ size_t SAPI::read_post(Pool& , char *buf
 	do {
 		int chunk_size=read(fileno(stdin), 
 			buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size));
-		if(chunk_size<0)
+		if(chunk_size<=0)
 			break;
 		read_size+=chunk_size;
 	} while(read_size<max_bytes);
@@ -141,7 +182,7 @@ void SAPI::add_header_attribute(Pool& ,
 /// @todo intelligent cache-control
 void SAPI::send_header(Pool& ) {
 	if(cgi) {
-		puts("expires: Fri, 23 Mar 2001 09:32:23 GMT");
+//		puts("expires: Fri, 23 Mar 2001 09:32:23 GMT");
 
 		// header | body  delimiter
 		puts("");
@@ -154,14 +195,16 @@ void SAPI::send_body(Pool& , const void
 
 //
 
-char *full_file_spec(char *file_name) {
+void full_file_spec(const char *file_name, char *buf, size_t buf_size) {
 	if(file_name && !strchr(file_name, '/')) {
-		static char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
-		static char buf[MAX_STRING];
-		snprintf(buf, MAX_STRING, "%s/%s", cwd, file_name);
-		return buf;
+		char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
+		snprintf(buf, buf_size, "%s/%s", cwd, file_name);
+	} else {
+		strncpy(buf, file_name, buf_size);
 	}
-	return file_name;
+#ifdef WIN32
+	back_slashes_to_slashes(buf);
+#endif
 }
 
 /**
@@ -171,6 +214,7 @@ main workhorse
 		IIS: remove trailing default-document[index.html] from $request.uri.
 		to do that we need to consult metabase,
 		wich is tested but seems slow.
+		IIS5 todo find out proper 'illegal call' check 
 */
 void real_parser_handler(
 					const char *filespec_to_process,
@@ -178,49 +222,32 @@ void real_parser_handler(
 	// init socks
 	init_socks(pool);
 	
-#ifdef XML
-	/**
-	* Initialize Xerces and Xalan.
-	*
-	* Should be called only once per process before making
-	* any other API calls.
-	*/
-	//_asm int 3;
-	XalanInitialize();
-#endif
-	
 	// init global classes
 	init_methoded_array(pool);
 	// init global variables
 	pa_globals_init(pool);
 	
 	if(!filespec_to_process)
-		throw Exception(0, 0,
-		0,
-		"Parser/%s", PARSER_VERSION);
+		SAPI::die("Parser/%s", PARSER_VERSION);
 	
 	// Request info
 	Request::Info request_info;
+	char document_root_buf[MAX_STRING];
 	if(cgi) {
 		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")) {
 			// IIS
-			size_t len=strlen(filespec_to_process)-strlen(path_info);
-			char *buf=(char *)pool.malloc(len+1);
-			memcpy(buf, filespec_to_process, len); buf[len]=0;
-			request_info.document_root=buf;
+			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;
+			request_info.document_root=document_root_buf;
 		} else
-			throw Exception(0, 0,
-			0,
-			"CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)");
+			throw Exception("parser.runtime",
+				0,
+				"CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)");
 	} else {
-		static char buf[MAX_STRING];
-		strncpy(buf, filespec_to_process, MAX_STRING-1); buf[MAX_STRING-1]=0;
-		if(rsplit(buf, '/') || rsplit(buf, '\\')) // strip filename
-			request_info.document_root=buf;
-		else
-			request_info.document_root="";
+		full_file_spec("", document_root_buf, sizeof(document_root_buf));
+		request_info.document_root=document_root_buf;
 	}
 	request_info.path_translated=filespec_to_process;
 	request_info.method=request_method ? request_method : "GET";
@@ -241,19 +268,20 @@ void real_parser_handler(
 			} else
 				request_info.uri=path_info;
 			else
-				throw Exception(0, 0,
-				0,
-				"CGI: no PATH_INFO defined(in reinventing REQUEST_URI)");
+				throw Exception("parser.runtime",
+					0,
+					"CGI: no PATH_INFO defined(in reinventing REQUEST_URI)");
 			
+#ifndef WIN32
+			// they've changed this under IIS5.
 			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 &&
 					script_name_len != uri_len) // under IIS they are the same
-					throw Exception(0, 0,
-					0,
-					"CGI: illegal call");
+					SAPI::die("CGI: illegal call");
 			}
+#endif
 	} else
 		request_info.uri=0;
 	
@@ -266,47 +294,64 @@ void real_parser_handler(
 	// prepare to process request
 	Request request(pool,
 		request_info,
-		cgi ? String::UL_USER_HTML : String::UL_AS_IS
-		);
+#ifdef _DEBUG
+		String::UL_HTML|String::UL_OPTIMIZE_BIT
+#else
+		cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS
+#endif
+		,
+		true /* status_allowed */);
 	
 	// some root-controlled location
-#ifdef SYSCONFDIR
-	const char *root_config_filespec=SYSCONFDIR "/" CONFIG_FILE_NAME;
+	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;
+	else {
+#ifdef ROOT_CONFIG_DIR
+		root_config_filespec=ROOT_CONFIG_DIR "/" CONFIG_FILE_NAME;
 #else
 #	ifdef WIN32
-	// c:\windows
-	char root_config_path[MAX_STRING];
-	GetWindowsDirectory(root_config_path, MAX_STRING);
-	
-	char root_config_filespec[MAX_STRING];
-	snprintf(root_config_filespec, MAX_STRING, 
-		"%s/%s", 
-		root_config_path, CONFIG_FILE_NAME);
+		// c:\windows
+		char windows_dir[MAX_STRING];
+		GetWindowsDirectory(windows_dir, MAX_STRING);
+
+		char buf[MAX_STRING];
+		snprintf(buf, MAX_STRING, 
+			"%s/%s", 
+			windows_dir, CONFIG_FILE_NAME);
+		
+		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;
+	else {
 	// beside by binary
 	// @todo full path, not ./!
-	static char site_config_path[MAX_STRING];
-	strncpy(site_config_path, argv0, MAX_STRING-1);  site_config_path[MAX_STRING-1]=0; // filespec of my binary
-	if(!(
-		rsplit(site_config_path, '/') || 
-		rsplit(site_config_path, '\\'))) { // strip filename
-		// no path, just filename
-		site_config_path[0]='.'; site_config_path[1]=0;
+		char beside_binary_path[MAX_STRING];
+		strncpy(beside_binary_path, argv0, MAX_STRING-1);  beside_binary_path[MAX_STRING-1]=0; // filespec of my binary
+		if(!(
+			rsplit(beside_binary_path, '/') || 
+			rsplit(beside_binary_path, '\\'))) { // strip filename
+			// no path, just filename
+			beside_binary_path[0]='.'; beside_binary_path[1]=0;
+		}
+		char buf[MAX_STRING];
+		snprintf(buf, MAX_STRING, 
+			"%s/%s", 
+			beside_binary_path, CONFIG_FILE_NAME);
+		site_config_filespec=buf;
 	}
 	
-	char site_config_filespec[MAX_STRING];
-	snprintf(site_config_filespec, MAX_STRING, 
-		"%s/%s", 
-		site_config_path, CONFIG_FILE_NAME);
-	
 	// process the request
 	request.core(
-		root_config_filespec, false,
-		site_config_filespec, false,
+		root_config_filespec, false /*don't fail_on_read_problem*/,
+		site_config_filespec, false /*don't fail_on_read_problem*/,
 		header_only);
 	
 	//
@@ -316,12 +361,22 @@ void real_parser_handler(
 	extern void log_pool_stats(Pool& pool);
 	log_pool_stats(pool);
 #endif
+
+#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
+	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,
+		string_string_shortcut_economy,
+		total_alloc_size);
+#endif
+
 }
 
 void call_real_parser_handler__do_SEH(
 								 const char *filespec_to_process,
 								 const char *request_method, bool header_only) {
-#if _MSC_VER & !defined(_DEBUG)
+#if _MSC_VER && !defined(_DEBUG)
 	LPEXCEPTION_POINTERS system_exception=0;
 	__try {
 #endif
@@ -329,26 +384,39 @@ void call_real_parser_handler__do_SEH(
 			filespec_to_process,
 			request_method, header_only);
 		
-#if _MSC_VER & !defined(_DEBUG)
+#if _MSC_VER && !defined(_DEBUG)
 	} __except (
 		(system_exception=GetExceptionInformation()), 
 		EXCEPTION_EXECUTE_HANDLER) {
 		
 		if(system_exception)
 			if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord)
-				throw Exception(0, 0,
-				0,
-				"Exception 0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);
+				throw Exception(0,
+					0,
+					"Exception 0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);
 			else
-				throw Exception(0, 0, 0, "Exception <no exception record>");
+				throw Exception(0, 0, "Exception <no exception record>");
 			else
-				throw Exception(0, 0, 0, "Exception <no exception information>");
+				throw Exception(0, 0, "Exception <no exception information>");
 	}
 #endif
 }
 
+#if _MSC_VER
+int failed_new(size_t size) {
+	SAPI::die("out of memory in 'new', failed to allocated %u bytes", size);
+	return 0; // not reached
+}
+#endif
+
+#ifdef HAVE_SET_NEW_HANDLER
+void failed_new() {
+    SAPI::die("out of memory in 'new'");
+}
+#endif
+
 int main(int argc, char *argv[]) {
-	int result;
+//	_asm int 3;
 	argv0=argv[0];
 
 	umask(2);
@@ -363,8 +431,8 @@ int main(int argc, char *argv[]) {
 	if(!cgi) {
 		if(argc<2) {
 			printf(
-				"Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)\n"
-				"Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)\n"
+				"Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n"
+				"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 				"\n"
 				"Usage: %s <file>\n",
 				PARSER_VERSION, 
@@ -379,48 +447,49 @@ int main(int argc, char *argv[]) {
 	setmode(fileno(stderr), _O_BINARY);
 #endif
 
-	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
-#ifdef WIN32
-	back_slashes_to_slashes(filespec_to_process);
+#if _MSC_VER
+	_set_new_handler(failed_new);
+
+#ifdef _DEBUG
+	// Get current flag
+	int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
+
+	// Turn on leak-checking bit
+	tmpFlag |= _CRTDBG_LEAK_CHECK_DF;
+
+	// Set flag to the new value
+	_CrtSetDbgFlag( tmpFlag );
+//	_CrtSetBreakAlloc(471);
+
+#endif
+
+#endif
+
+#ifdef HAVE_SET_NEW_HANDLER
+	std::set_new_handler(failed_new);
 #endif
-	filespec_to_process=full_file_spec(filespec_to_process);
+
+	char *raw_filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+	char filespec_to_process[MAX_STRING];
+	full_file_spec(raw_filespec_to_process, filespec_to_process, sizeof(filespec_to_process));
 
 	const char *request_method=getenv("REQUEST_METHOD");
 	bool header_only=request_method && strcasecmp(request_method, "HEAD")==0;
+
 	try { // global try
 		call_real_parser_handler__do_SEH(
 			filespec_to_process,
 			request_method, header_only);
-
-		// successful finish
-		result=0;
 	} catch(const Exception& e) { // global problem 
 		// don't allocate anything on pool here:
 		//   possible pool' exception not catch-ed now
 		//   and there could be out-of-memory exception
 
-		const char *body=e.comment();
-		// log it
-		SAPI::log(pool, "exception in request exception handler: %s", body);
-
-		//
-		int content_length=strlen(body);
-
-		// prepare header
-		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);
-
-		// send header
-		SAPI::send_header(pool);
-
-		// body
-		if(!header_only)
-			SAPI::send_body(pool, body, content_length);
-
-		// unsuccessful finish
-		result=1;
+		SAPI::die("exception in request exception handler: %s", e.comment());
+#ifndef _DEBUG
+	} catch(...) { 
+		SAPI::die("<unknown exception>");
+#endif
 	}
 	
 
@@ -429,5 +498,6 @@ int main(int argc, char *argv[]) {
 	if(!cgi)
 		SAPI::send_body(pool, "\n", 1);
 #endif
-	return result;
+//_asm int 3;
+	return 0;
 }