--- parser3/src/targets/apache/mod_parser3_core.C	2020/10/14 00:07:42	1.26
+++ parser3/src/targets/apache/mod_parser3_core.C	2024/11/09 15:38:21	1.38
@@ -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)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.26 2020/10/14 00:07:42 moko Exp $";
+volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.38 2024/11/09 15:38:21 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -78,34 +78,40 @@ void SAPI::die(const char* fmt, ...) {
 //	va_end(args);
 }
 
+void SAPI::send_error(SAPI_Info& info, const char *exception_cstr, const char *status){
+	// capitalized headers passed for preventing malloc during capitalization
+	add_header_attribute(info, HTTP_STATUS_CAPITALIZED, status);
+	add_header_attribute(info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain");
+	send_header(info);
+	send_body(info, exception_cstr, strlen(exception_cstr));
+}
+
 char* SAPI::Env::get(SAPI_Info& SAPI_info, const char* name) {
 	const char* dont_return_me=pa_ap_table_get(SAPI_info.r->subprocess_env, name);
 	return dont_return_me?pa_strdup(dont_return_me):0;
 }
 
+bool SAPI::Env::set(SAPI_Info&, const char*, const char*) {
+	return false;
+}
+
 #ifndef DOXYGEN
 struct SAPI_environment_append_info {
 	const char** cur;
 };
 #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;
@@ -176,11 +182,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);
@@ -195,21 +197,21 @@ static void real_parser_handler(SAPI_Inf
 	request_info.query_string=SAPI_info.r->args;
 	request_info.uri=request_info.strip_absolute_uri(SAPI::Env::get(SAPI_info, "REQUEST_URI"));
 	request_info.content_type=SAPI::Env::get(SAPI_info, "CONTENT_TYPE");
-	request_info.content_length=pa_atoui(SAPI::Env::get(SAPI_info, "CONTENT_LENGTH"), 10);
+	request_info.content_length=pa_atoul(SAPI::Env::get(SAPI_info, "CONTENT_LENGTH"));
 	request_info.cookie=SAPI::Env::get(SAPI_info, "HTTP_COOKIE");
 	request_info.mail_received=false;
 	
 	// prepare to process request
-	Request request(
-		SAPI_info,
-		request_info,
-		String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)
-		);
+	Request request(SAPI_info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT));
 	
 	// process the request
-	request.core(
-		dcfg->parser_config_filespec, true, // /path/to/config
-		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