From: Rainer Jung <rjung@apache.org>
Date: Mon, 20 Jun 2022 21:07:17 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.55-rc1-candidate~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=273fda990df5af525c7ac39a0ea2cdd9839b0ad5;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1902118 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 743b4f83eac..32946e50f25 100644
--- a/STATUS
+++ b/STATUS
@@ -200,6 +200,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1822857,1876815,1893499,1900024,1900152,1900306,1900559,1900564,1900691,1900694 ^/httpd/httpd/trunk .
      +1: jailletc36, 
 
+  *) mod_heartmonitor: Allow "HeartbeatMaxServers 0"
+     to use file based storage instead of slotmem.
+     Needed after setting HeartbeatMaxServers default
+     to the documented value 10 in 2.4.54.
+     PR 66131.  [Jérôme Billiras]
+     Trunk version of patch:
+        https://svn.apache.org/r1902117
+     2.4.x patch: svn merge -c 1902117 ^/httpd/httpd/trunk .
+     +1: rjung,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
 
diff --git a/changes-entries/mod_heartmonitor-HeartbeatMaxServers.txt b/changes-entries/mod_heartmonitor-HeartbeatMaxServers.txt
new file mode 100644
index 00000000000..b2583580dd8
--- /dev/null
+++ b/changes-entries/mod_heartmonitor-HeartbeatMaxServers.txt
@@ -0,0 +1,5 @@
+  *) mod_heartmonitor: Allow "HeartbeatMaxServers 0"
+     to use file based storage instead of slotmem.
+     Needed after setting HeartbeatMaxServers default
+     to the documented value 10 in 2.4.54.
+     PR 66131.  [Jérôme Billiras]