hi all...
can somebody just take a quick look at this backport patch to verify that
I'm doing the minor bump properly?
thanks
--Geoff
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.310
diff -u -r1.988.2.310 CHANGES
--- CHANGES 3 Jul 2004 12:48:00 -0000 1.988.2.310
+++ CHANGES 6 Jul 2004 17:37:44 -0000
@@ -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
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.946
diff -u -r1.751.2.946 STATUS
--- STATUS 3 Jul 2004 12:48:00 -0000 1.751.2.946
+++ STATUS 6 Jul 2004 17:37:52 -0000
@@ -73,13 +73,6 @@
[ 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
Index: include/ap_mmn.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v
retrieving revision 1.52.2.11
diff -u -r1.52.2.11 ap_mmn.h
--- include/ap_mmn.h 11 Jun 2004 20:46:41 -0000 1.52.2.11
+++ include/ap_mmn.h 6 Jul 2004 17:38:11 -0000
@@ -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
Index: server/main.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/main.c,v
retrieving revision 1.140.2.8
diff -u -r1.140.2.8 main.c
--- server/main.c 30 Mar 2004 20:53:06 -0000 1.140.2.8
+++ server/main.c 6 Jul 2004 17:38:25 -0000
@@ -393,13 +393,13 @@
}
#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);
