From: Eric Covener <covener@apache.org>
Date: Tue, 29 Nov 2022 13:24:16 +0000 (+0000)
Subject: Merge r1904516 from trunk:
X-Git-Tag: 2.4.55-rc1-candidate~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaafacd0efc6bae4e2a9de616bf487b8a55437c1;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1904516 from trunk:

  *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300.
     trunk revision:

Submitted by: jim
Reviewed by: jim, ylavic, icing, jfclere



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

diff --git a/CHANGES b/CHANGES
index 282f3bae767..b6e8e7603c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@ Changes with Apache 2.4.55
      continued to work, the error log was in error. Fixed PR66190.
      [Stefan Eissing]
 
+  *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300.
+     [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>]
+
   *) mod_http2: Export mod_http2.h as public header. [Stefan Eissing]
 
   *) mod_md: a new directive `MDStoreLocks` can be used on cluster
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 3887746818a..eabf43681ca 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -1073,6 +1073,18 @@ static int hc_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
     hctp = NULL;
     tpsize = HC_THREADPOOL_SIZE;
 #endif
+
+    ajp_handle_cping_cpong = APR_RETRIEVE_OPTIONAL_FN(ajp_handle_cping_cpong);
+    if (ajp_handle_cping_cpong) {
+       proxy_hcmethods_t *method = proxy_hcmethods;
+       for (; method->name; method++) {
+           if (method->method == CPING) {
+               method->implemented = 1;
+               break;
+           }
+       }
+    }
+
     return OK;
 }
 static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
@@ -1129,17 +1141,6 @@ static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
         s = s->next;
     }
 
-    ajp_handle_cping_cpong = APR_RETRIEVE_OPTIONAL_FN(ajp_handle_cping_cpong);
-    if (ajp_handle_cping_cpong) {
-       proxy_hcmethods_t *method = proxy_hcmethods;
-       for (; method->name; method++) {
-           if (method->method == CPING) {
-               method->implemented = 1;
-               break;
-           }
-       }
-    }
-
     return OK;
 }