--- parser3/src/targets/cgi/parser3.C	2001/11/19 08:00:34	1.138
+++ parser3/src/targets/cgi/parser3.C	2002/01/31 10:20:21	1.151
@@ -4,14 +4,16 @@
 	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru>(http://paf.design.ru)
 
-	$Id: parser3.C,v 1.138 2001/11/19 08:00:34 paf Exp $
+	$Id: parser3.C,v 1.151 2002/01/31 10:20:21 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"
@@ -22,8 +24,8 @@
 #include "pa_version.h"
 #include "pool_storage.h"
 
-#ifdef XML
-#include <XalanTransformer/XalanCAPI.h>
+#ifdef WIN32
+#	include <windows.h>
 #endif
 
 //#define DEBUG_POOL_MALLOC
@@ -38,9 +40,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
@@ -50,9 +49,6 @@ const char **RCSIds[]={
 	classes_RCSIds,
 	types_RCSIds,
 	parser3_RCSIds,
-#ifdef XML
-	xalan_patched_RCSIds,
-#endif
 	0
 };
 
@@ -116,21 +112,22 @@ void SAPI::die(const char *fmt, ...) {
 	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
-    va_list args;
-	va_start(args,fmt);
 	::log(fmt, args);
-	va_end(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");
@@ -173,7 +170,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("");
@@ -203,6 +200,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,
@@ -210,26 +208,13 @@ 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;
@@ -277,15 +262,16 @@ void real_parser_handler(
 				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;
 	
@@ -298,12 +284,17 @@ void real_parser_handler(
 	// prepare to process request
 	Request request(pool,
 		request_info,
-		cgi ? String::UL_OPTIMIZED_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;
+#ifdef PARSER_ROOT_CONFIG_DIR
+	const char *root_config_filespec=PARSER_ROOT_CONFIG_DIR "/" CONFIG_FILE_NAME;
 #else
 #	ifdef WIN32
 	// c:\windows
@@ -379,7 +370,7 @@ void call_real_parser_handler__do_SEH(
 #endif
 }
 
-#ifdef WIN32
+#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
@@ -393,6 +384,7 @@ void failed_new() {
 #endif
 
 int main(int argc, char *argv[]) {
+//	_asm int 3;
 	argv0=argv[0];
 
 	umask(2);
@@ -423,8 +415,22 @@ int main(int argc, char *argv[]) {
 	setmode(fileno(stderr), _O_BINARY);
 #endif
 
-#ifdef WIN32
+#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
@@ -449,7 +455,7 @@ int main(int argc, char *argv[]) {
 		//   possible pool' exception not catch-ed now
 		//   and there could be out-of-memory exception
 
-		SAPI::die("exception in request exception handler: ", e.comment());
+		SAPI::die("exception in request exception handler: %s", e.comment());
 #ifndef _DEBUG
 	} catch(...) { 
 		SAPI::die("<unknown exception>");