--- parser3/src/targets/apache/mod_parser3_core.C	2020/10/28 22:32:02	1.29
+++ parser3/src/targets/apache/mod_parser3_core.C	2021/01/20 16:09:53	1.35
@@ -1,11 +1,11 @@
 /** @file
 Parser: apache 1.3/2.X module, part, compiled by parser3project.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.29 2020/10/28 22:32:02 moko Exp $";
+volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.35 2021/01/20 16:09:53 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -93,23 +93,17 @@ struct SAPI_environment_append_info {
 };
 #endif
 
-static const char* mk_env_pair(const char* key, const char* value) {
-	char *result=new(PointerFreeGC) char[strlen(key)+1/*=*/+strlen(value)+1/*0*/];
-	strcpy(result, key); strcat(result, "="); strcat(result, value);
-	return result;
-}
-
 static int SAPI_environment_append(void *d, const char* k, const char* val) {
 	if(k && val) {
 		SAPI_environment_append_info& info=*static_cast<SAPI_environment_append_info *>(d);
-		*info.cur++=mk_env_pair(k, val);
+		*info.cur++=pa_strcat(k, "=", val);
 	}
 	return 1/*true*/;
 }
 
 const char* const* SAPI::Env::get(SAPI_Info& SAPI_info) {
 	const pa_table *t=SAPI_info.r->subprocess_env;
-	const char** result=new const char*[pa_ap_table_size(t)+1/*0*/];
+	const char** result=new(PointerGC) const char*[pa_ap_table_size(t)+1/*0*/];
 	SAPI_environment_append_info info={result};
 	pa_ap_table_do(SAPI_environment_append, &info, t, 0); *info.cur=0; // mark EOE
 	return result;
@@ -180,11 +174,7 @@ main workhorse
 */
 static void real_parser_handler(SAPI_Info& SAPI_info, Parser_module_config *dcfg) {
 	// collect garbage from prev request
-#ifndef PA_DEBUG_DISABLE_GC
-	GC_dont_gc=0;
-	GC_gcollect();
-	GC_dont_gc=1;
-#endif
+	pa_gc_collect();
 
 	// populate env
 	pa_ap_add_common_vars(SAPI_info.r);
@@ -207,7 +197,13 @@ static void real_parser_handler(SAPI_Inf
 	Request request(SAPI_info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
 	
 	// process the request
-	request.core(dcfg->parser_config_filespec, SAPI_info.r->header_only!=0);
+	const char *config=dcfg->parser_config_filespec;
+#ifdef SYSTEM_CONFIG_FILE
+	if(!config && entry_exists(SYSTEM_CONFIG_FILE)){
+		config=SYSTEM_CONFIG_FILE;
+	}
+#endif
+	request.core(config, SAPI_info.r->header_only!=0);
 }
 
 #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION