diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | modules/proxy/mod_proxy_hcheck.c | 23 |
2 files changed, 15 insertions, 11 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.1 + *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300. + [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>] + *) mod_proxy_hcheck: hcmethod now allows for HTTP/1.1 requests using GET11, HEAD11 and/or OPTIONS11. [Jim Jagielski] diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index 637af645ea..dd2740e81c 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -1088,6 +1088,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, @@ -1144,17 +1156,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; } |