--- parser3/src/targets/cgi/parser3.C	2020/08/12 22:00:12	1.288
+++ parser3/src/targets/cgi/parser3.C	2020/08/13 11:44:21	1.290
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.288 2020/08/12 22:00:12 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.290 2020/08/13 11:44:21 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -144,8 +144,18 @@ void SAPI::log(SAPI_Info&, const char* f
 }
 
 static void die_or_abort(const char* fmt, va_list args, bool write_core) {
-	// inform user
+}
 
+void SAPI::die(const char* fmt, ...) {
+	va_list args;
+
+	// logging first, first vsnprintf
+	va_start(args,fmt);
+	::log(fmt, args);
+	va_end(args);
+
+	// inform user, second vsnprintf
+	va_start(args, fmt);
 	char body[MAX_STRING];
 	int content_length=vsnprintf(body, MAX_STRING, fmt, args);
 
@@ -165,41 +175,7 @@ static void die_or_abort(const char* fmt
 	// body
 	SAPI::send_body(SAPI_info, body, content_length);
 
-	// exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version]
-	if(write_core) {
-#ifdef WIN32
-		// IIS with abort failes to show STDOUT, it just barks "abnormal program termination"
-		exit(1);
-#else
-		abort();
-#endif
-	} else
-		exit(1);
-}
-
-void SAPI::die(const char* fmt, ...) {
-	va_list args;
-
-	// logging first, can't log inside die_or_abort due to vsnprintf (bug #106)
-	va_start(args,fmt);
-	::log(fmt, args);
-	va_end(args);
-
-	va_start(args, fmt);
-	die_or_abort(fmt, args, false /*write core?*/);
-//	va_end(args);
-}
-
-void SAPI::abort(const char* fmt, ...) {
-	va_list args;
-
-	// logging first, can't log inside die_or_abort due to vsnprintf (bug #106)
-	va_start(args,fmt);
-	::log(fmt, args);
-	va_end(args);
-
-	va_start(args, fmt);
-	die_or_abort(fmt, args, true /*write core?*/);
+	exit(1);
 //	va_end(args);
 }
 
@@ -493,7 +469,7 @@ static void real_parser_handler(const ch
 }
 
 #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION
-static const Exception call_real_parser_handler__do_PEH_return_it(const char* filespec_to_process, const char* request_method, bool header_only){
+static const Exception call_real_parser_handler__do_PEH_return_it(const char* filespec_to_process, const char* request_method, bool header_only) {
 	try {
 		real_parser_handler(filespec_to_process, request_method, header_only);
 	} catch(const Exception& e) {
@@ -503,14 +479,13 @@ static const Exception call_real_parser_
 	return Exception();
 }
 
-static void call_real_parser_handler__supress_system_exception(const char* filespec_to_process, const char* request_method, bool header_only){
+static void call_real_parser_handler__supress_system_exception(const char* filespec_to_process, const char* request_method, bool header_only) {
 	Exception parser_exception;
 	LPEXCEPTION_POINTERS system_exception=0;
 
 	__try {
 		parser_exception=call_real_parser_handler__do_PEH_return_it(filespec_to_process, request_method, header_only);
 	} __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) {
-
 		if(system_exception)
 			if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord)
 				throw Exception("system", 0, "0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);