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

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 3d9cb309658fc0a881ec34b8a1e16ef9ec8a22fd..7cea508adeeaca6fc141272532dc48571582c8d9 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -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 =

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 63e35a48a29c1c534a24bc622f178c2d2204f25d..194b97e2f0415d22e8c711df0a84b2d3aea152b5 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -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);
 }