--- parser3/src/targets/cgi/parser3.C	2010/03/19 11:31:30	1.256
+++ parser3/src/targets/cgi/parser3.C	2013/07/22 15:33:31	1.263
@@ -1,16 +1,16 @@
 /** @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/03/19 11:31:30 $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.263 2013/07/22 15:33:31 moko Exp $";
 
 #include "pa_config_includes.h"
 
-#if _MSC_VER
-#	include <crtdbg.h>
+#ifdef _MSC_VER
+#include <crtdbg.h>
 #endif
 
 #include "pa_sapi.h"
@@ -20,8 +20,9 @@ static const char * const IDENT_PARSER3_
 #include "pa_socks.h"
 #include "pa_version.h"
 
-#ifdef WIN32
-#	include <windows.h>
+#ifdef _MSC_VER
+#include <windows.h>
+#include <direct.h>
 #endif
 
 // defines
@@ -106,7 +107,7 @@ static void log(const char* fmt, va_list
 	time_t t=time(0);
 	if(const char* stamp=ctime(&t)) { // never saw that
 		if(size_t len=strlen(stamp)) // saw once stamp being =""
-			fprintf(f, "[%.*s] [%u] ", len-1, stamp,
+			fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp,
 			(unsigned int)getpid()
 			);
 	}
@@ -118,7 +119,7 @@ static void log(const char* fmt, va_list
 	fwrite(buf, size, 1, f);
 
 	if(request_info)
-		fprintf(f, " [uri=%s, method=%s, cl=%u]",
+		fprintf(f, " [uri=%s, method=%s, cl=%lu]",
 			request_info->uri? request_info->uri: "<unknown>",
 			request_info->method? request_info->method: "<unknown>",
 			request_info->content_length);
@@ -151,13 +152,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 +190,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) {
@@ -269,8 +275,8 @@ static void full_file_spec(const char* f
 			)
 				strncpy(buf, file_name, buf_size);
 		else {
-			char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
-			snprintf(buf, buf_size, "%s/%s", cwd, file_name);
+			char cwd[MAX_STRING];
+			snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name);
 		}
 	else
 		buf[0]=0;
@@ -510,8 +516,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 +618,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-2013 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"
@@ -679,10 +684,13 @@ int main(int argc, char *argv[]) {
 
 	// were we started as CGI?
 	cgi=
-		getenv("SERVER_SOFTWARE") || 
-		getenv("SERVER_NAME") || 
-		getenv("GATEWAY_INTERFACE") || 
-		getenv("REQUEST_METHOD");
+		(
+			getenv("SERVER_SOFTWARE") || 
+			getenv("SERVER_NAME") || 
+			getenv("GATEWAY_INTERFACE") || 
+			getenv("REQUEST_METHOD")
+		)
+		&& !getenv("PARSER_VERSION");
 	
 	char *raw_filespec_to_process;
 	if(cgi) {