--- parser3/src/targets/cgi/parser3.C	2020/12/15 20:57:56	1.331
+++ parser3/src/targets/cgi/parser3.C	2020/12/21 23:35:50	1.340
@@ -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.331 2020/12/15 20:57:56 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.340 2020/12/21 23:35:50 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
@@ -201,12 +200,6 @@ static void log_signal(const char* signa
 	SAPI::log(*sapiInfo, "%s received %s processing request", signal_name, request ? "while" : "before or after");
 }
 
-#ifdef SIGUSR1
-static void SIGUSR1_handler(int /*sig*/){
-	log_signal("SIGUSR1");
-}
-#endif
-
 #ifdef SIGPIPE
 #define SIGPIPE_NAME "SIGPIPE"
 static const String sigpipe_name(SIGPIPE_NAME);
@@ -316,7 +309,8 @@ static void connection_handler(SAPI_Info
 	try {
 		memset(&request_info, 0, sizeof(request_info));
 
-		connection.read_header();
+		if(!connection.read_header())
+			return; // ignore "void" connections
 		info.populate_env();
 
 		char document_root_buf[MAX_STRING];
@@ -339,7 +333,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);
+		}
 	}
 }
 
@@ -391,6 +389,7 @@ static void httpd_mode() {
 					connection.sock = -1;
 					break;
 #else
+#ifdef HAVE_TLS
 					pthread_t thread;
 					pthread_attr_t attr;
 					pthread_attr_init(&attr);
@@ -400,6 +399,7 @@ static void httpd_mode() {
 						throw Exception("httpd.fork", 0, "thread creation failed (%d)", result);
 					connection.sock=-1;
 					break;
+#endif
 				case HTTPD_Server::PARALLEL:
 					pid=fork();
 					if(pid<0)
@@ -589,9 +589,6 @@ int main(int argc, char *argv[]) {
 	bool cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION");
 	sapiInfo = cgi ? new SAPI_Info_CGI() : new SAPI_Info();
 
-#ifdef SIGUSR1
-	signal(SIGUSR1, SIGUSR1_handler);
-#endif
 #ifdef SIGPIPE
 	signal(SIGPIPE, SIGPIPE_handler);
 #endif