--- parser3/src/targets/cgi/parser3.C	2020/12/25 14:32:44	1.341
+++ parser3/src/targets/cgi/parser3.C	2021/11/30 16:18:26	1.345
@@ -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.341 2020/12/25 14:32:44 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.345 2021/11/30 16:18:26 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -77,7 +77,7 @@ static void pa_log(const char* fmt, va_l
 
 	if(!opened && filespec_4log) {
 		char beside_config_path[MAX_STRING];
-		strncpy(beside_config_path, filespec_4log, MAX_STRING-1);  beside_config_path[MAX_STRING-1]=0;
+		pa_strncpy(beside_config_path, filespec_4log, MAX_STRING);
 		if(!(rsplit(beside_config_path, '/') || rsplit(beside_config_path, '\\'))) { // strip filename
 			// no path, just filename
 			strcpy(beside_config_path, ".");
@@ -186,7 +186,7 @@ static void full_disk_path(const char* f
 		|| file_name[0] && file_name[1]==':'
 #endif
 	){
-		strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0;
+		pa_strncpy(buf, file_name, buf_size);
 	} else {
 		char cwd[MAX_STRING];
 		snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name);
@@ -274,11 +274,10 @@ const char* maybe_reconstruct_IIS_status
 }
 
 #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) maybe_reconstruct_IIS_status_in_qs(s)
-#else 
+#else
 #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) s
 #endif
 
-
 class RequestController {
 public:
 	RequestController(Request* r){
@@ -299,6 +298,9 @@ public:
 	}
 };
 
+/** httpd support */
+static const String httpd_class_name("httpd");
+
 static void config_handler(SAPI_Info &info) {
 	char document_root_buf[MAX_STRING];
 	full_disk_path("", document_root_buf, sizeof(document_root_buf));
@@ -344,7 +346,7 @@ static void connection_handler(SAPI_Info
 		// prepare to process request
 		Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
 		// process the request
-		r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main"));
+		r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, main_method_name, &httpd_class_name);
 	} catch(const Exception& e) { // exception in connection handling or unhandled exception
 		SAPI::log(info, "%s", e.comment());
 		const char *status = info.exception_http_status(e.type());
@@ -378,9 +380,6 @@ static void httpd_mode() {
 
 	int sock = HTTPD_Server::bind(httpd_host_port);
 
-#ifdef SIGCHLD
-	signal(SIGCHLD, SIG_IGN);
-#endif
 #ifdef SIGPIPE
 	signal(SIGPIPE, SIG_IGN);
 #endif
@@ -388,10 +387,12 @@ static void httpd_mode() {
 	while(1){
 #ifndef _MSC_VER
 		pid_t pid=1;
+		if(HTTPD_Server::mode == HTTPD_Server::PARALLEL)
+			while (waitpid((pid_t)(-1), 0, WNOHANG) > 0);
 #endif
 		try {
 			HTTPD_Connection connection;
-			if(!connection.accept(sock, 5))
+			if(!connection.accept(sock, 500))
 				continue;
 
 			switch (HTTPD_Server::mode) {