From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 18 Aug 2022 10:44:52 +0000 (+0000)
Subject: core: Follow up to r1902728: ap_max_mem_free early setting.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aca2baf90298a90bf79f76a931d53134c0f1c58;p=thirdparty%2Fapache%2Fhttpd.git

core: Follow up to r1902728: ap_max_mem_free early setting.

Set ap_max_mem_free at static initialization time so that the main thread,
created early from init_process(), has some (default) limits for its pool.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1903523 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm_common.c b/server/mpm_common.c
index b2dac2fe49a..2973bc9f4f2 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -180,10 +180,10 @@ AP_DECLARE_DATA int ap_max_requests_per_child;
 AP_DECLARE_DATA char ap_coredump_dir[MAX_STRING_LEN];
 AP_DECLARE_DATA int ap_coredumpdir_configured;
 AP_DECLARE_DATA int ap_graceful_shutdown_timeout;
-AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
 AP_DECLARE_DATA apr_size_t ap_thread_stacksize;
 
 #define ALLOCATOR_MAX_FREE_DEFAULT (2048*1024)
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free = ALLOCATOR_MAX_FREE_DEFAULT;
 
 /* Set defaults for config directives implemented here.  This is
  * called from core's pre-config hook, so MPMs which need to override