--- parser3/src/targets/cgi/parser3.C	2002/11/20 14:50:51	1.205
+++ parser3/src/targets/cgi/parser3.C	2002/12/09 13:02:36	1.211
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_PARSER3_C="$Date: 2002/11/20 14:50:51 $";
+static const char* IDENT_PARSER3_C="$Date: 2002/12/09 13:02:36 $";
 
 #include "pa_config_includes.h"
 
@@ -20,6 +20,7 @@ static const char* IDENT_PARSER3_C="$Dat
 #include "pa_request.h"
 #include "pa_socks.h"
 #include "pa_version.h"
+
 #include "pool_storage.h"
 
 #ifdef WIN32
@@ -87,6 +88,9 @@ static void log(const char *fmt, va_list
 	if(!opened)
 		f=stderr;
 
+	// use no memory [so that we could log out-of-memory error]
+	setbuf(f, 0); // stderr stream is unbuffered by default, but still...
+
 	// prefix
 	time_t t=time(0);
 	if(const char *stamp=ctime(&t)) { // never saw that
@@ -153,7 +157,8 @@ void SAPI::die(const char *fmt, ...) {
 	// body
 	SAPI::send_body(global_pool, body, content_length);
 
-	exit(1);
+	// exit & try to produce core dump
+	abort();
 }
 
 const char *SAPI::get_env(Pool& , const char *name) {
@@ -208,9 +213,9 @@ static void full_file_spec(const char *f
 	if(file_name)
 		if(file_name[0]=='/' 
 #ifdef WIN32
-			|| (file_name[0] && file_name[1]==':')
+			|| file_name[0] && file_name[1]==':'
 #endif
-			) 
+			)
 			strncpy(buf, file_name, buf_size);
 		else {
 			char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
@@ -227,8 +232,8 @@ static void log_signal(const char *signa
 	SAPI::log(global_pool, request? "%s received. uri=%s, qs=%s"
 		:"%s received. no request being processed", 
 		signal_name,
-		request?request->info.uri:"-",
-		request?request->info.query_string:"-");
+		request && request->info.uri?request->info.uri:"-",
+		request && request->info.query_string?request->info.query_string:"-");
 }
 
 #ifdef SIGUSR1
@@ -490,9 +495,11 @@ int main(int argc, char *argv[]) {
 		getenv("REQUEST_METHOD");
 	
 	char *raw_filespec_to_process;
-	if(cgi) 
+	if(cgi) {
 		raw_filespec_to_process=getenv("PATH_TRANSLATED");
-	else {
+		if(raw_filespec_to_process && !*raw_filespec_to_process)
+			raw_filespec_to_process=0;
+	} else {
 		optind = 1;
 		opterr = 0;
 		int c;