--- parser3/src/targets/cgi/parser3.C	2001/03/24 08:54:04	1.42
+++ parser3/src/targets/cgi/parser3.C	2001/03/24 14:56:09	1.45
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.42 2001/03/24 08:54:04 paf Exp $
+	$Id: parser3.C,v 1.45 2001/03/24 14:56:09 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <time.h>
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -27,12 +28,13 @@
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
 
+const char *argv0;
 Pool pool(0); // global pool [dont describe to doxygen: it confuses it with param names]
 bool cgi; ///< we were started as CGI?
 
 #ifdef WIN32
 /// global system errors into parser exceptions converter
-static LONG WINAPI TopLevelExceptionFilter (struct _EXCEPTION_POINTERS *ExceptionInfo) {
+static LONG WINAPI TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) {
 	char buf[MAX_STRING];
 	if(ExceptionInfo && ExceptionInfo->ExceptionRecord) {
 		struct _EXCEPTION_RECORD *er=ExceptionInfo->ExceptionRecord;
@@ -50,15 +52,6 @@ static LONG WINAPI TopLevelExceptionFilt
 }
 #endif
 
-#ifdef WIN32
-static void fix_slashes(char *s) {
-	if(s)
-		for(; *s; s++)
-			if(*s=='\\')
-				*s='/';
-}
-#endif
-
 //@{
 /// SAPI funcs decl
 const char *SAPI::get_env(Pool& pool, const char *name) {
@@ -96,6 +89,39 @@ void SAPI::send_header(Pool& pool) {
 void SAPI::send_body(Pool& pool, const char *buf, size_t size) {
 	stdout_write(buf, size);
 }
+
+/// appends to parser3.log located beside my binary
+void SAPI::log(Pool& pool, const char *fmt, ...) {
+	bool opened;
+	FILE *f=0;
+
+	if(argv0) {
+		// beside by binary
+		char file_spec[MAX_STRING];
+		strncpy(file_spec, argv0, MAX_STRING);  // filespec of my binary
+		rsplit(file_spec, '/');  rsplit(file_spec, '\\');// strip filename
+		strcat(file_spec, "/parser3.log");
+		f=fopen(file_spec, "at");
+	}
+	opened=f!=0;
+	if(!opened)
+		f=stderr;
+
+	// prefix
+	time_t t=time(0);
+	const char *stamp=ctime(&t);
+	fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp);
+	// message
+    va_list args;
+	va_start(args,fmt);
+	vfprintf(f, fmt, args);
+	va_end(args);
+	// newline
+	fprintf(f, "\n");
+
+	if(opened)
+		fclose(f);
+}
 //@}
 
 /**
@@ -107,6 +133,8 @@ void SAPI::send_body(Pool& pool, const c
 		wich is tested but seems slow.
 */
 int main(int argc, char *argv[]) {
+	argv0=argv[0];
+
 	umask(2);
 
 #ifdef WIN32
@@ -124,15 +152,14 @@ int main(int argc, char *argv[]) {
 	
 	if(!cgi) {
 		if(argc<2) {
-			char *binary=argv[0];
-			printf("Usage: %s <file>\n", binary?binary:"parser3");
+			printf("Usage: %s <file>\n", argv0?argv0:"parser3");
 			exit(1);
 		}
 	}
 
 	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
 #ifdef WIN32
-	fix_slashes(filespec_to_process);
+	back_slashes_to_slashes(filespec_to_process);
 #endif
 
 	const char *request_method=getenv("REQUEST_METHOD");
@@ -167,7 +194,7 @@ int main(int argc, char *argv[]) {
 			} else
 				PTHROW(0, 0,
 					0,
-					"CGI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)");
+					"CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)");
 		} else {
 			static char buf[MAX_STRING];
 			strncpy(buf, filespec_to_process, MAX_STRING);
@@ -181,7 +208,7 @@ int main(int argc, char *argv[]) {
 		if(cgi) 
 			if(const char *env_request_uri=getenv("REQUEST_URI"))
 				request_info.uri=env_request_uri;
-			else if (const char *path_info=getenv("PATH_INFO"))
+			else if(const char *path_info=getenv("PATH_INFO"))
 				if(query_string) {
 					char *reconstructed_uri=(char *)malloc(
 						strlen(path_info)+1/*'?'*/+
@@ -195,7 +222,7 @@ int main(int argc, char *argv[]) {
 			else
 				PTHROW(0, 0,
 					0,
-					"CGI: no PATH_INFO defined (in reinventing REQUEST_URI)");
+					"CGI: no PATH_INFO defined(in reinventing REQUEST_URI)");
 		else
 			request_info.uri=0;
 
@@ -238,7 +265,19 @@ int main(int argc, char *argv[]) {
 		// successful finish
 		return 0;
 	} PCATCH(e) { // global problem 
+		// must be first in PCATCH{}
+#ifdef WIN32
+		SetUnhandledExceptionFilter(0);
+#endif
+		// 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();
+		// log it
+		SAPI::log(pool, "exception in request exception handler: %s", body);
+
+		//
 		int content_length=strlen(body);
 
 		// prepare header