Commit be6f2e5a authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Make sure that mod_include's post_config hook always runs before 

mod_cgi(d)'s post_config hook.  Mod_include creates a hash table in the
post_config stage that mod_cgi(d) uses during it's post_config stage, so
it must be done in this order.
Submitted by:	 Brian Havard <brianh@kheldar.apana.org.au>


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

modules/generators/mod_cgi.c

+2 −1
Original line number Diff line number Diff line
@@ -989,8 +989,9 @@ static void cgi_post_config(apr_pool_t *p, apr_pool_t *plog, 


static void register_hooks(apr_pool_t *p)

{

    static const char * const aszPre[] = { "mod_include.c", NULL };

    ap_hook_handler(cgi_handler, NULL, NULL, APR_HOOK_MIDDLE);

    ap_hook_post_config(cgi_post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);

    ap_hook_post_config(cgi_post_config, aszPre, NULL, APR_HOOK_REALLY_FIRST);

}



module AP_MODULE_DECLARE_DATA cgi_module =

modules/generators/mod_cgid.c

+3 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,9 @@ static int handle_exec(include_ctx_t *ctx, apr_bucket_brigade **bb, request_rec 


static void register_hook(apr_pool_t *p)

{

    ap_hook_post_config(cgid_init, NULL, NULL, APR_HOOK_MIDDLE);

    static const char * const aszPre[] = { "mod_include.c", NULL };



    ap_hook_post_config(cgid_init, aszPre, NULL, APR_HOOK_MIDDLE);

    ap_hook_handler(cgid_handler, NULL, NULL, APR_HOOK_MIDDLE);

}