Mailing List Archive

Author: jim
Date: Tue May 17 18:13:11 2022
New Revision: 1901007

URL: http://svn.apache.org/viewvc?rev=1901007&view=rev
Log:
Merge from trunk:
Submitted by: jim
Reviewed by: 1900340

Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1900340

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1901007&r1=1901006&r2=1901007&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 17 18:13:11 2022
@@ -169,11 +169,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patches: svn merge -c 1900335 ^/httpd/httpd/trunk .
+1: jailletc36, rpluem, ylavic

- *) mod_heartmonitor: Be consistent with the type of the last argument passed to
- hm_processmsg()
- trunk patches: https://svn.apache.org/r1900340
- 2.4.x patches: svn merge -c 1900340 ^/httpd/httpd/trunk .
- +1: jailletc36, rpluem, ylavic

*) mod_http2: remove unscheduling of ongoing tasks when client
behaviour triggers mood change. Fixes https://github.com/icing/mod_h2/issues/231
@@ -232,7 +227,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
2.4.x patches: svn merge -c 1900100 ^/httpd/httpd/trunk .
+1: ylavic,

- *) ab: Allow for TLSv1.3 when the SSL library supports it. BZ 63594 64699
+ *) ab: Allow for TLSv1.3 when the SSL library supports it. BZ 63594 64699
trunk patches: https://svn.apache.org/r1900157
2.4.x patches: svn merge -c 1900157 ^/httpd/httpd/trunk .
+1: ylavic,

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=1901007&r1=1901006&r2=1901007&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 Tue May 17 18:13:11 2022
@@ -529,7 +529,7 @@ static hm_server_t *hm_get_server(hm_ctx

/* Process a message received from a backend node */
static void hm_processmsg(hm_ctx_t *ctx, apr_pool_t *p,
- apr_sockaddr_t *from, char *buf, int len)
+ apr_sockaddr_t *from, char *buf, apr_size_t len)
{
apr_table_t *tbl;