Commit f303b0cc authored by Geoffrey Young's avatar Geoffrey Young
Browse files

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
parent 30eac137

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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


































STATUS



+1
−8



























Changes for STATUS: 1 added line, 8 removed lines.



Original line number
Diff line number
Diff line









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


































include/ap_mmn.h



+3
−1



























Changes for include/ap_mmn.h: 3 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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


































server/main.c



+2
−2



























Changes for server/main.c: 2 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -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