From: Jeff Trawick Date: Wed, 23 Apr 2014 12:38:03 +0000 (+0000) Subject: ensure that the post-config hook runs after that of mod_ssl X-Git-Tag: 2.5.0-alpha~4265 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4515e518726b5d363cf061209d839fed0723ac2;p=apache ensure that the post-config hook runs after that of mod_ssl (mod_ssl_ct looks for stuff that should have been found while mod_ssl ran) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1589389 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/mod_ssl_ct.c b/modules/ssl/mod_ssl_ct.c index a2f9d3422a..d191ab1792 100644 --- a/modules/ssl/mod_ssl_ct.c +++ b/modules/ssl/mod_ssl_ct.c @@ -2609,9 +2609,12 @@ static int ssl_ct_detach_backend(request_rec *r, static void ct_register_hooks(apr_pool_t *p) { + static const char * const run_after_mod_ssl[] = {"mod_ssl.c", NULL}; + ap_hook_pre_config(ssl_ct_pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_check_config(ssl_ct_check_config, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_post_config(ssl_ct_post_config, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_post_config(ssl_ct_post_config, run_after_mod_ssl, NULL, + 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); APR_OPTIONAL_HOOK(proxy, detach_backend, ssl_ct_detach_backend, NULL, NULL,