--- parser3/src/targets/cgi/parser3.C	2003/04/02 07:29:21	1.216.2.30.2.18
+++ parser3/src/targets/cgi/parser3.C	2003/07/24 11:31:25	1.218
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_PARSER3_C="$Date: 2003/04/02 07:29:21 $";
+static const char* IDENT_PARSER3_C="$Date: 2003/07/24 11:31:25 $";
 
 #include "pa_config_includes.h"
 
@@ -145,6 +145,9 @@ static void die_or_abort(const char* fmt
 		// IIS with abort failes to show STDOUT, it just barks "abnormal program termination"
 		exit(1);
 #else
+#if _MSC_VER
+		_asm int 3;
+#endif
 		abort();
 #endif
 	} 
@@ -224,7 +227,7 @@ static void full_file_spec(const char* f
 			|| file_name[0] && file_name[1]==':'
 #endif
 			)
-			strncpy(buf, file_name, buf_size);
+				strncpy(buf, file_name, buf_size);
 		else {
 			char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
 			snprintf(buf, buf_size, "%s/%s", cwd, file_name);
@@ -273,9 +276,8 @@ main workhorse
 		to do that we need to consult metabase,
 		wich is tested but seems slow.
 */
-static void real_parser_handler(
-					const char* filespec_to_process,
-					const char* request_method, bool header_only) {
+static void real_parser_handler(const char* filespec_to_process,
+				const char* request_method, bool header_only) {
 	// init socks
 	pa_init_socks();
 	
@@ -286,7 +288,7 @@ static void real_parser_handler(
 		SAPI::die("Parser/%s", PARSER_VERSION);
 	
 	// Request info
-	Request_info request_info;
+	Request_info request_info;  memset(&request_info, 0, sizeof(request_info));
 	char document_root_buf[MAX_STRING];
 	if(cgi) {
 		if(const char* env_document_root=getenv("DOCUMENT_ROOT"))
@@ -385,12 +387,7 @@ static void real_parser_handler(
 	// prepare to process request
 	Request request(SAPI_info, 
 		request_info,
-/*#ifdef _DEBUG
-		String::L_HTML|String::L_OPTIMIZE_BIT
-#else*/
-		cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS
-/*#endif*/
-		,
+		cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS,
 		true /* status_allowed */);
 
 	// get request ptr for signal handlers
@@ -449,8 +446,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 {
@@ -470,8 +467,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
@@ -522,13 +519,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());*/
 
@@ -617,7 +616,7 @@ int main(int argc, char *argv[]) {
 
 	// Set flag to the new value
 	_CrtSetDbgFlag( tmpFlag );
-//	_CrtSetBreakAlloc(60);
+//	_CrtSetBreakAlloc(61);
 
 	_CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
 	_CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR );
@@ -637,8 +636,30 @@ 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
 	}
 
 	return 0;