initialize server arrays prior to calling ap_setup_prelinked_modules

so that static modules can push Defines values when registering
hooks just like DSO modules can
Submitted by:	philippe chiasson
Reviewed by:	geoff

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

diff --git a/CHANGES b/CHANGES
index b88d0d03f54ac4c62f9c2316307837d5b097e383..f07218153bdb858c62b8b6e682d75b9106e61e6d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) initialize server arrays prior to calling ap_setup_prelinked_modules
+     so that static modules can push Defines values when registering
+     hooks just like DSO modules can ["Philippe M. Chiasson" <gozer cpan.org>]
+
   *) Add -l option to rotatelogs to let it use local time rather than
      UTC.  PR 24417.  [Ken Coar, Uli Zappe <uli ritual.org>]
 

diff --git a/server/main.c b/server/main.c
index 69e8bde00ba8b6940457ad0925a34cbee060c450..f166844ee13363975c96c4a8a44d14e610255534 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -428,6 +428,12 @@ int main(int argc, const char * const argv[])
     }
 #endif
 
+    apr_pool_create(&pcommands, pglobal);
+    apr_pool_tag(pcommands, "pcommands");
+    ap_server_pre_read_config  = apr_array_make(pcommands, 1, sizeof(char *));
+    ap_server_post_read_config = apr_array_make(pcommands, 1, sizeof(char *));
+    ap_server_config_defines   = apr_array_make(pcommands, 1, sizeof(char *));
+
     error = ap_setup_prelinked_modules(process);
     if (error) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_EMERG, 0, NULL, "%s: %s",
@@ -435,12 +441,6 @@ int main(int argc, const char * const argv[])
         destroy_and_exit_process(process, 1);
     }
 
-    apr_pool_create(&pcommands, pglobal);
-    apr_pool_tag(pcommands, "pcommands");
-    ap_server_pre_read_config  = apr_array_make(pcommands, 1, sizeof(char *));
-    ap_server_post_read_config = apr_array_make(pcommands, 1, sizeof(char *));
-    ap_server_config_defines   = apr_array_make(pcommands, 1, sizeof(char *));
-
     ap_run_rewrite_args(process);
 
     /* Maintain AP_SERVER_BASEARGS list in http_main.h to allow the MPM