--- parser3/src/targets/cgi/parser3.C	2020/11/16 16:15:36	1.316
+++ parser3/src/targets/cgi/parser3.C	2020/12/06 22:36:10	1.320
@@ -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.316 2020/11/16 16:15:36 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.320 2020/12/06 22:36:10 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -40,16 +40,16 @@ volatile const char * IDENT_PARSER3_C="$
 
 static const char* filespec_to_process = 0; // [file]
 static const char* httpd_host_port = 0; // -p option
-static const char* config_filespec = 0; // -f option or from env or next to the executable
+static const char* config_filespec = 0; // -f option or from env or next to the executable if exists
 static bool mail_received = false; // -m option? [asked to parse incoming message to $mail:received]
-static char** argv_all = NULL;
+static char** argv_extra = NULL;
 
 // for signal handlers
 Request *request=0;
 
-// for die error logging
-static Request_info request_info;
-static const char* filespec_4log = 0; // never null
+// for error logging
+static Request_info request_info; // global for correct log() reporting
+static const char* filespec_4log = NULL; // never null
 
 // SAPI
 
@@ -266,15 +266,33 @@ public:
 	}
 };
 
-static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection){
+static void config_handler(SAPI_Info &info) {
+	char document_root_buf[MAX_STRING];
+	full_disk_path("", document_root_buf, sizeof(document_root_buf));
+
+	request_info.document_root = document_root_buf;
+	request_info.uri = "";
+	request_info.argv = argv_extra;
+
+	// prepare to process request
+	Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
+	{
+		// initing ::request ptr for signal handlers
+		RequestController rc(&request);
+		// process main auto.p only
+		request.core(config_filespec, false, String::Empty);
+		// clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory
+	}
+}
+
+static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) {
 	connection.read_header();
 	info.populate_env();
 
-	// connection request info, still global for correct log() reporting
-	memset(&request_info, 0, sizeof(request_info));
-
 	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();
@@ -284,7 +302,7 @@ static void connection_handler(SAPI_Info
 	request_info.content_length = connection.content_length();
 	request_info.cookie = info.get_env("HTTP_COOKIE");
 	request_info.mail_received = false;
-	request_info.argv = argv_all;
+	request_info.argv = argv_extra;
 
 	// prepare to process request
 	Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
@@ -297,9 +315,11 @@ static void connection_handler(SAPI_Info
 	}
 }
 
-static void httpd_mode(){
+static void httpd_mode() {
 	int sock = HTTPD_Server::bind(httpd_host_port);
 
+	config_handler(*sapiInfo);
+
 	while(1){
 		try {
 			HTTPD_Connection connection;
@@ -398,17 +418,10 @@ static void real_parser_handler(bool cgi
 	request_info.cookie = getenv("HTTP_COOKIE");
 	request_info.mail_received = mail_received;
 
-	request_info.argv = argv_all;
+	request_info.argv = argv_extra;
 
 #ifdef PA_DEBUG_CGI_ENTRY_EXIT
-	log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s, cookies=%s, cl=%u",
-		request_info.method,
-		request_info.uri,
-		request_info.query_string,
-		request_info.document_root,
-		request_info.path_translated,
-		request_info.cookie,
-		request_info.content_length);
+	log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s", request_info.method, request_info.uri, request_info.query_string, request_info.document_root, request_info.path_translated);
 #endif
 
 	// prepare to process request
@@ -521,7 +534,7 @@ int main(int argc, char *argv[]) {
 	char *raw_filespec_to_process = NULL;
 	if(cgi) {
 		raw_filespec_to_process=getenv("PATH_TRANSLATED");
-		argv_all=argv + 1;
+		argv_extra=argv + 1;
 	} else {
 		int optind=1;
 		while(optind < argc){
@@ -575,7 +588,7 @@ int main(int argc, char *argv[]) {
 				usage(argv[0]);
 		}
 
-		argv_all=argv + optind;
+		argv_extra=argv + optind;
 	}
 
 #ifdef _MSC_VER
@@ -598,15 +611,15 @@ int main(int argc, char *argv[]) {
 	_CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR );
 #endif
 
-	char filespec_to_process_buf[MAX_STRING];
-	if(raw_filespec_to_process && *raw_filespec_to_process){
-		full_disk_path(raw_filespec_to_process, filespec_to_process_buf, sizeof(filespec_to_process_buf));
-		filespec_to_process=filespec_to_process_buf;
-	}
+	try { // global try
+		char filespec_to_process_buf[MAX_STRING];
+		if(raw_filespec_to_process && *raw_filespec_to_process){
+			full_disk_path(raw_filespec_to_process, filespec_to_process_buf, sizeof(filespec_to_process_buf));
+			filespec_to_process=filespec_to_process_buf;
+		}
 
-	config_filespec = locate_config(config_filespec, argv[0]);
+		config_filespec = locate_config(config_filespec, argv[0]);
 
-	try { // global try
 		REAL_PARSER_HANDLER(cgi);
 	} catch(const Exception& e) { // exception in unhandled exception
 		SAPI::die("%s", e.comment());