From: Geoffrey Young <geoff@apache.org>
Date: Tue, 6 Jul 2004 18:25:14 +0000 (+0000)
Subject: initialize server arrays prior to calling ap_setup_prelinked_modules
X-Git-Tag: STRIKER_2_0_51_RC1^2~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e5f01c2e456dce5de94c8438e0537908e7018ba;p=thirdparty%2Fapache%2Fhttpd.git

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, nd, stas


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

diff --git a/CHANGES b/CHANGES
index d172dc12031..f94141f45fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.51
 
+  *) 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>]
+
   *) Small fix to allow reverse proxying to an ftp server. Previously
      an attempt to do this would try and connect to 0.0.0.0, regardless
      of the server specified. PR 24922
diff --git a/STATUS b/STATUS
index 9e6354f0873..9f4645a10a2 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/07/03 12:48:00 $]
+Last modified at [$Date: 2004/07/06 18:25:14 $]
 
 Release:
 
@@ -73,13 +73,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
-    *) 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>]
-         server/main.c: r1.158
-       +1: geoff, nd, stas
-       nd adds: minor bump.
-
     *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)
        http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_util.c?r1=1.46&r2=1.47
        +1: jorton
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 16724d1b99e..95f8272f82a 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -80,6 +80,8 @@
  * 20020903.7 (2.0.49-dev) added XHTML Doctypes
  * 20020903.8 (2.0.50-dev) export ap_set_sub_req_protocol and
  *                         ap_finalize_sub_req_protocol on Win32 and NetWare
+ * 20020903.9 (2.0.51-dev) create pcommands and initialize arrays before
+ *                         calling ap_setup_prelinked_modules
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
@@ -87,7 +89,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20020903
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 8                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 9                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/server/main.c b/server/main.c
index 8b9adf9bf44..3070a0e84ec 100644
--- a/server/main.c
+++ b/server/main.c
@@ -393,14 +393,14 @@ int main(int argc, const char * const argv[])
     }
 #endif
 
-    ap_setup_prelinked_modules(process);
-
     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_setup_prelinked_modules(process);
+
     ap_run_rewrite_args(process);
 
     /* Maintain AP_SERVER_BASEARGS list in http_main.h to allow the MPM