httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: httpd-2.0/server main.c
Date Tue, 06 Jul 2004 18:25:15 GMT
geoff       2004/07/06 11:25:15

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               include  Tag: APACHE_2_0_BRANCH ap_mmn.h
               server   Tag: APACHE_2_0_BRANCH main.c
  Log:
  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
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.311 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.310
  retrieving revision 1.988.2.311
  diff -u -r1.988.2.310 -r1.988.2.311
  --- CHANGES	3 Jul 2004 12:48:00 -0000	1.988.2.310
  +++ CHANGES	6 Jul 2004 18:25:13 -0000	1.988.2.311
  @@ -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
  
  
  
  1.751.2.947 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.946
  retrieving revision 1.751.2.947
  diff -u -r1.751.2.946 -r1.751.2.947
  --- STATUS	3 Jul 2004 12:48:00 -0000	1.751.2.946
  +++ STATUS	6 Jul 2004 18:25:14 -0000	1.751.2.947
  @@ -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
  
  
  
  No                   revision
  No                   revision
  1.52.2.12 +3 -1      httpd-2.0/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v
  retrieving revision 1.52.2.11
  retrieving revision 1.52.2.12
  diff -u -r1.52.2.11 -r1.52.2.12
  --- ap_mmn.h	11 Jun 2004 20:46:41 -0000	1.52.2.11
  +++ ap_mmn.h	6 Jul 2004 18:25:14 -0000	1.52.2.12
  @@ -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
  
  
  
  No                   revision
  No                   revision
  1.140.2.9 +2 -2      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.140.2.8
  retrieving revision 1.140.2.9
  diff -u -r1.140.2.8 -r1.140.2.9
  --- main.c	30 Mar 2004 20:53:06 -0000	1.140.2.8
  +++ main.c	6 Jul 2004 18:25:14 -0000	1.140.2.9
  @@ -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);
   
  
  
  

Mime
View raw message