--- parser3/src/targets/cgi/parser3.C	2020/12/15 17:10:38	1.329
+++ parser3/src/targets/cgi/parser3.C	2020/12/15 20:57:56	1.331
@@ -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.329 2020/12/15 17:10:38 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.331 2020/12/15 20:57:56 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -52,9 +52,6 @@ static bool mail_received = false; // -m
 static char* parser3_filespec = 0; // argv[0]
 static char** argv_extra = NULL;
 
-// for signal handlers
-static THREAD_LOCAL Request *request=0;
-
 // for error logging
 static THREAD_LOCAL Request_info request_info; // global for correct log() reporting
 static const char* filespec_4log = NULL; // null only if system-wide auto.p used
@@ -309,26 +306,22 @@ static void config_handler(SAPI_Info &in
 
 	// prepare to process request
 	Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
-	{
-		// initing ::request ptr for signal handlers
-		RequestController rc(&r);
-		// only once
-		config_filespec = locate_config(config_filespec, parser3_filespec);
-		// process main auto.p only
-		r.core(config_filespec, false, String::Empty);
-		// clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory
-	}
+	// only once
+	config_filespec = locate_config(config_filespec, parser3_filespec);
+	// process main auto.p only
+	r.core(config_filespec, false, String::Empty);
 }
 
 static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) {
 	try {
+		memset(&request_info, 0, sizeof(request_info));
+
 		connection.read_header();
 		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();
@@ -342,13 +335,8 @@ static void connection_handler(SAPI_Info
 
 		// prepare to process request
 		Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
-		{
-			// initing ::request ptr for signal handlers
-			RequestController rc(&r);
-			// process the request
-			r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main"));
-			// clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory
-		}
+		// process the request
+		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()));
@@ -390,6 +378,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;