From: Jim Jagielski Date: Tue, 17 May 2022 18:13:11 +0000 (+0000) Subject: Merge from trunk: X-Git-Tag: 2.4.54-rc1-candidate~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de36fead566bfd70affb268a67c03dc5e09a966c;p=thirdparty%2Fapache%2Fhttpd.git Merge from trunk: Submitted by: jim Reviewed by: 1900340 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901007 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 7bacd0c9d28..c8f8864f457 100644 --- a/STATUS +++ b/STATUS @@ -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, diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c index 30db11ac7b8..4e193d28edc 100644 --- a/modules/cluster/mod_heartmonitor.c +++ b/modules/cluster/mod_heartmonitor.c @@ -529,7 +529,7 @@ static hm_server_t *hm_get_server(hm_ctx_t *ctx, const char *ip, const int port) /* 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;