[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    svn commit: r1905608 - in /httpd/httpd/branches/2.4.x: ./ CHANGES modules/proxy/mod_proxy_hcheck.c
From:       covener () apache ! org
Date:       2022-11-29 13:24:17
Message-ID: 20221129132417.6B01217AC39 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: covener
Date: Tue Nov 29 13:24:16 2022
New Revision: 1905608

URL: http://svn.apache.org/viewvc?rev=1905608&view=rev
Log:
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


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c

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

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1905608&r1=1905607&r2=1905608&view=diff
 ==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Nov 29 13:24:16 2022
@@ -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

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c?rev=1905608&r1=1905607&r2=1905608&view=diff
 ==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c Tue Nov 29 13:24:16 \
2022 @@ -1073,6 +1073,18 @@ static int hc_pre_config(apr_pool_t *pco
     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,
         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;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]