--- parser3/src/targets/cgi/parser3.C	2020/12/15 17:23:56	1.330
+++ parser3/src/targets/cgi/parser3.C	2020/12/17 11:47:17	1.338
@@ -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.330 2020/12/15 17:23:56 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.338 2020/12/17 11:47:17 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -14,6 +14,7 @@ volatile const char * IDENT_PARSER3_C="$
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_version.h"
+#include "pa_threads.h"
 #include "pa_vconsole.h"
 #include "pa_sapi_info.h"
 
@@ -58,7 +59,7 @@ static const char* filespec_4log = NULL;
 
 // SAPI
 
-static void log(const char* fmt, va_list args) {
+static void pa_log(const char* fmt, va_list args) {
 	bool opened=false;
 	FILE *f=0;
 
@@ -98,7 +99,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] ", (int)len-1, stamp, (unsigned int)getpid() );
+			fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)pa_get_thread_id() );
 	}
 	// message
 
@@ -118,20 +119,18 @@ static void log(const char* fmt, va_list
 		fflush(f);
 }
 
-#ifdef PA_DEBUG_CGI_ENTRY_EXIT
-static void log(const char* fmt, ...) {
+void pa_log(const char* fmt, ...) {
 	va_list args;
 	va_start(args,fmt);
-	log(fmt, args);
+	pa_log(fmt, args);
 	va_end(args);
 }
-#endif
 
 // appends to parser3.log located next to the config file if openable, to stderr otherwize
 void SAPI::log(SAPI_Info&, const char* fmt, ...) {
 	va_list args;
 	va_start(args,fmt);
-	::log(fmt, args);
+	pa_log(fmt, args);
 	va_end(args);
 }
 
@@ -140,7 +139,7 @@ void SAPI::die(const char* fmt, ...) {
 
 	// logging first, first vsnprintf
 	va_start(args,fmt);
-	::log(fmt, args);
+	pa_log(fmt, args);
 	va_end(args);
 
 	// inform user, second vsnprintf
@@ -314,13 +313,15 @@ static void config_handler(SAPI_Info &in
 
 static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) {
 	try {
-		connection.read_header();
+		memset(&request_info, 0, sizeof(request_info));
+
+		if(!connection.read_header())
+			return; // ignore "void" connections
 		info.populate_env();
 
 		char document_root_buf[MAX_STRING];
 		full_disk_path("", document_root_buf, sizeof(document_root_buf));
 
-		memset(&request_info, 0, sizeof(request_info));
 		request_info.document_root = document_root_buf;
 		request_info.path_translated = filespec_to_process;
 		request_info.method = connection.method();
@@ -338,7 +339,11 @@ static void connection_handler(SAPI_Info
 		r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main"));
 	} catch(const Exception& e) { // exception in connection handling or unhandled exception
 		SAPI::log(info, "%s", e.comment());
-		SAPI::send_error(info, e.comment(), info.exception_http_status(e.type()));
+		const char *status = info.exception_http_status(e.type());
+		if(*status){
+			info.clear_response_headers();
+			SAPI::send_error(info, e.comment(), status);
+		}
 	}
 }
 
@@ -377,6 +382,7 @@ static void httpd_mode() {
 		pid_t pid=1;
 #endif
 		try {
+			request_info.method=NULL; // wipe previous request for correct logging
 			HTTPD_Connection connection;
 			if(!connection.accept(sock, 5))
 				continue;