--- parser3/src/targets/cgi/parser3.C	2010/07/21 22:23:33	1.257
+++ parser3/src/targets/cgi/parser3.C	2012/03/16 09:24:16	1.260
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3_C="$Date: 2010/07/21 22:23:33 $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.260 2012/03/16 09:24:16 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -151,13 +151,6 @@ void SAPI::log(SAPI_Info&, const char* f
 }
 
 static void die_or_abort(const char* fmt, va_list args, bool write_core) {
-	// log
-
-	// logging is more important than user 
-	// she can cancel download, we'd get SIGPIPE, 
-	// nothing would be logged then
-	::log(fmt, args);
-
 	// inform user
 
 	char body[MAX_STRING];
@@ -196,17 +189,29 @@ static void die_or_abort(const char* fmt
 }
 
 void SAPI::die(const char* fmt, ...) {
-    va_list args;
+	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?*/);
-//unreachable anyway	va_end(args);
+	die_or_abort(fmt, args, false /*write core?*/);
+//	va_end(args);
 }
 
 void SAPI::abort(const char* fmt, ...) {
-    va_list args;
+	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?*/);
-//unreachable anyway	va_end(args);
+	die_or_abort(fmt, args, true /*write core?*/);
+//	va_end(args);
 }
 
 char* SAPI::get_env(SAPI_Info& , const char* name) {
@@ -510,8 +515,7 @@ static void real_parser_handler(const ch
 
 	// prepare to process request
 	Request request(SAPI_info, request_info,
-		cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS,
-		true /* status_allowed */);
+		cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS);
 
 	{
 		// get ::request ptr for signal handlers
@@ -613,7 +617,7 @@ static void call_real_parser_handler__su
 static void usage(const char* program) {
 	printf(
 		"Parser/%s\n"
-		"Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"