From: Jeff Trawick <trawick@apache.org>
Date: Mon, 21 Mar 2016 11:45:44 +0000 (+0000)
Subject: Check for proxy_detach_backend hook, for 2.4.x compatibility
X-Git-Tag: 2.5.0-alpha~1850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23ce448f339054369b04e29f163a2b94fd0ace6f;p=apache

Check for proxy_detach_backend hook, for 2.4.x compatibility


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735949 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/mod_ssl_ct.c b/modules/ssl/mod_ssl_ct.c
index c21beee060..39ff1cc770 100644
--- a/modules/ssl/mod_ssl_ct.c
+++ b/modules/ssl/mod_ssl_ct.c
@@ -2655,6 +2655,10 @@ static ct_server_config *copy_ct_server_config(apr_pool_t *p,
     return sconf;
 }
 
+#if AP_MODULE_MAGIC_AT_LEAST(20140207,2)
+/* Only trunk has the proxy_detach_backend hook; without it,
+ * no way to set the envvars which represent backend CT status
+ */
 static int ssl_ct_detach_backend(request_rec *r,
                                  proxy_conn_rec *backend)
 {
@@ -2698,6 +2702,7 @@ static int ssl_ct_detach_backend(request_rec *r,
 
     return OK;
 }
+#endif
 
 static void ct_register_hooks(apr_pool_t *p)
 {
@@ -2709,8 +2714,10 @@ static void ct_register_hooks(apr_pool_t *p)
                         APR_HOOK_MIDDLE);
     ap_hook_post_read_request(ssl_ct_post_read_request, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_child_init(ssl_ct_child_init, NULL, NULL, APR_HOOK_MIDDLE);
+#if AP_MODULE_MAGIC_AT_LEAST(20140207,2)
     APR_OPTIONAL_HOOK(proxy, detach_backend, ssl_ct_detach_backend, NULL, NULL,
                       APR_HOOK_MIDDLE);
+#endif
     APR_OPTIONAL_HOOK(ssl, init_server, ssl_ct_init_server, NULL, NULL,
                       APR_HOOK_MIDDLE);
     APR_OPTIONAL_HOOK(ssl, pre_handshake,