You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2022/08/21 20:29:07 UTC
svn commit: r1903619 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS changes-entries/mod_heartmonitor-HeartbeatMaxServers.txt docs/manual/mod/mod_heartmonitor.xml modules/cluster/mod_heartmonitor.c
Author: jim
Date: Sun Aug 21 20:29:06 2022
New Revision: 1903619
URL: http://svn.apache.org/viewvc?rev=1903619&view=rev
Log:
Merge r1902117, r1902130, r1902132, r1902133 from trunk:
*) 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.
[Jérôme Billiras]
Fix numeric check for HeartbeatMaxServers.
*) mod_heartmonitor: Document interaction between
HeartbeatStorage and HeartbeatMaxServers.
Fix new typo in docs...
Submitted by: rjung
Reviewed by: rjung, rpluem, jim
Removed:
httpd/httpd/branches/2.4.x/changes-entries/mod_heartmonitor-HeartbeatMaxServers.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_heartmonitor.xml
httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1902117,1902130,1902132-1902133
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1903619&r1=1903618&r2=1903619&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Aug 21 20:29:06 2022
@@ -1,6 +1,11 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.55
+ *) 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]
+
Changes with Apache 2.4.54
*) SECURITY: CVE-2022-31813: mod_proxy X-Forwarded-For dropped by
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1903619&r1=1903618&r2=1903619&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Aug 21 20:29:06 2022
@@ -149,18 +149,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) 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
- https://svn.apache.org/r1902130
- https://svn.apache.org/r1902132
- https://svn.apache.org/r1902133
- 2.4.x patch: svn merge -c 1902117,1902130,1902132,1902133 ^/httpd/httpd/trunk .
- +1: rjung, rpluem, jim
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_heartmonitor.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_heartmonitor.xml?rev=1903619&r1=1903618&r2=1903619&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_heartmonitor.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_heartmonitor.xml Sun Aug 21 20:29:06 2022
@@ -76,7 +76,7 @@ use <module>mod_slotmem_shm</module>.</p
<directivesynopsis>
<name>HeartbeatStorage</name>
-<description>Path to store heartbeat data</description>
+<description>Path to store heartbeat data when using flat-file storage</description>
<syntax>HeartbeatStorage <var>file-path</var></syntax>
<default>HeartbeatStorage logs/hb.dat</default>
<contextlist><context>server config</context></contextlist>
@@ -84,7 +84,8 @@ use <module>mod_slotmem_shm</module>.</p
<usage>
<p>The <directive>HeartbeatStorage</directive> directive specifies the
path to store heartbeat data. This flat-file is used only when
- <module>mod_slotmem_shm</module> is not loaded.</p>
+ <module>mod_slotmem_shm</module> is not loaded and
+ <directive>HeartbeatMaxServers</directive> is set to 0.</p>
</usage>
</directivesynopsis>
@@ -101,6 +102,8 @@ heartbeat requests to this server</descr
maximum number of servers that will be sending requests to this monitor
server. It is used to control the size of the shared memory allocated
to store the heartbeat info when <module>mod_slotmem_shm</module> is in use.</p>
+ <p>For using flat-file storage (without loading <module>mod_slotmem_shm</module>),
+ this must be set to 0. The value must be either 0, or bigger or equals 10.</p>
</usage>
</directivesynopsis>
</modulesynopsis>
Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1903619&r1=1903618&r2=1903619&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Sun Aug 21 20:29:06 2022
@@ -892,8 +892,9 @@ static const char *cmd_hm_maxworkers(cmd
}
maxworkers = atoi(data);
- if (maxworkers <= 10)
- return "HeartbeatMaxServers: Should be bigger than 10";
+ if (maxworkers != 0 && maxworkers < 10)
+ return "HeartbeatMaxServers: Should be 0 for file storage, "
+ "or greater or equal than 10 for slotmem";
return NULL;
}