--- parser3/src/targets/cgi/parser3.C	2003/04/01 15:42:26	1.216.2.30.2.17
+++ parser3/src/targets/cgi/parser3.C	2003/04/04 06:32:01	1.216.2.30.2.21
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_PARSER3_C="$Date: 2003/04/01 15:42:26 $";
+static const char* IDENT_PARSER3_C="$Date: 2003/04/04 06:32:01 $";
 
 #include "pa_config_includes.h"
 
@@ -29,7 +29,6 @@ static const char* IDENT_PARSER3_C="$Dat
 #	include <getopt.h>
 #endif
 
-//#define DEBUG_POOL_MALLOC
 //#define DEBUG_MAILRECEIVE "mailreceive.eml"
 
 // consts
@@ -114,12 +113,6 @@ void SAPI::log(SAPI_Info&, const char* f
 }
 
 static void die_or_abort(const char* fmt, va_list args, bool write_core) {
-	//_asm int 3;
-#ifdef DEBUG_POOL_MALLOC
-	extern void log_pool_stats();
-	log_pool_stats(SAPI_info);
-#endif
-
 	// log
 
 	// logging is more important than user 
@@ -149,7 +142,6 @@ static void die_or_abort(const char* fmt
 	// exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version]
 	if(write_core) {
 #if defined(WIN32) && !defined(_DEBUG)
-		//_asm int 3;
 		// IIS with abort failes to show STDOUT, it just barks "abnormal program termination"
 		exit(1);
 #else
@@ -440,14 +432,9 @@ static void real_parser_handler(
 	
 	//
 	pa_done_socks();
-	
-#ifdef DEBUG_POOL_MALLOC
-	extern void log_pool_stats();
-	log_pool_stats(request_pool);
-#endif
 }
 
-#if _MSC_VER && !defined(_DEBUG)
+#if _MSC_VER && !defined(_DEBUG) &&0
 #	define PA_USE___TRY
 struct Parser_executed {
 	bool with_system_exception;
@@ -462,8 +449,8 @@ Parser_executed
 void
 #endif
 call_real_parser_handler__do_SEH_return_it(
-								 const char* filespec_to_process,
-								 const char* request_method, bool header_only) {
+					   const char* filespec_to_process,
+					   const char* request_method, bool header_only) {
 #ifdef PA_USE___TRY
 	Parser_executed result={false};
 	__try {
@@ -476,7 +463,6 @@ call_real_parser_handler__do_SEH_return_
 	} __except (
 		(result.system_exception=GetExceptionInformation()), 
 		EXCEPTION_EXECUTE_HANDLER) {
-		//_asm int 3;
 		result.with_system_exception=true;
 	}
 	return result;
@@ -484,8 +470,8 @@ call_real_parser_handler__do_SEH_return_
 }
 
 static void call_real_parser_handler__do_SEH(
-								 const char* filespec_to_process,
-								 const char* request_method, bool header_only) {
+					     const char* filespec_to_process,
+					     const char* request_method, bool header_only) {
 #ifdef PA_USE___TRY
 	Parser_executed executed=
 #endif
@@ -536,13 +522,15 @@ int main(int argc, char *argv[]) {
 	// so deciding for speed
 	GC_dont_gc=1; 
 #endif
-
-	/*
+/*
+	
 	Array<int> test;
 	test+=3;
 	test+=4;
 //	int a=test.count();
-	int b=test.get(0);
+	int i=0;
+	scanf("%d", &i);
+	int b=test.get(i);
 //	int b=test.get(10);
 	printf("%d", b);//test.count());*/
 
@@ -565,7 +553,6 @@ int main(int argc, char *argv[]) {
 #ifdef _DEBUG
 	//_crtBreakAlloc=4042;
 #endif
-	//_asm int 3;
 	argv0=argv[0];
 
 	umask(2);
@@ -652,10 +639,31 @@ int main(int argc, char *argv[]) {
 		// 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();
+		char buf[MAX_STRING];
+		snprintf(buf, MAX_STRING, "exception in request exception handler: %s",
+			body);
+		// log it
+		SAPI::log(SAPI_info, "%s", buf);
+
+		//
+		int content_length=strlen(buf);
+
+		// prepare header
+		SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain");
+		char content_length_cstr[MAX_NUMBER];
+		snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length);
+		SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr);
+
+		// send header
+		SAPI::send_header(SAPI_info);
+
+		// send body
+		if(!header_only)
+			SAPI::send_body(SAPI_info, buf, content_length);
 
-		SAPI::die("exception in request exception handler: %s", e.comment());
+		// unsuccessful finish
 	}
 
-//	_asm int 3;
 	return 0;
 }