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 Thu, 17 Jun 2004 15:49:40 GMT
geoff       2004/06/17 08:49:40

  Modified:    .        CHANGES
               server   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
  
  Revision  Changes    Path
  1.1518    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1517
  retrieving revision 1.1518
  diff -u -r1.1517 -r1.1518
  --- CHANGES	16 Jun 2004 21:27:06 -0000	1.1517
  +++ CHANGES	17 Jun 2004 15:49:40 -0000	1.1518
  @@ -2,6 +2,10 @@
   
     [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>]
   
  
  
  
  1.158     +6 -6      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- main.c	25 Apr 2004 17:23:31 -0000	1.157
  +++ main.c	17 Jun 2004 15:49:40 -0000	1.158
  @@ -428,18 +428,18 @@
       }
   #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",
                        ap_server_argv0, error);
           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);
   
  
  
  

Mime
View raw message