httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/loggers mod_log_config.c
Date Thu, 26 Feb 2004 20:00:55 GMT
trawick     2004/02/26 12:00:55

  Modified:    modules/loggers mod_log_config.c
  Log:
  a kind fix for a compile error unfortunately broke an order
  dependency...  the buffered logs array needs to be initialized
  prior to opening the logs
  
  Revision  Changes    Path
  1.114     +9 -7      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- mod_log_config.c	9 Feb 2004 20:29:20 -0000	1.113
  +++ mod_log_config.c	26 Feb 2004 20:00:55 -0000	1.114
  @@ -1176,20 +1176,22 @@
   
   static int init_config_log(apr_pool_t *pc, apr_pool_t *p, apr_pool_t *pt, server_rec *s)
   {
  -    /* First, do "physical" server, which gets default log fd and format
  +    int res;
  +
  +    /* First init the buffered logs array, which is needed when opening the logs. */
  +    if (buffered_logs) {
  +        all_buffered_logs = apr_array_make(p, 5, sizeof(buffered_log *));
  +    }
  +
  +    /* Next, do "physical" server, which gets default log fd and format
        * for the virtual servers, if they don't override...
        */
  -    int res = open_multi_logs(s, p);
  +    res = open_multi_logs(s, p);
   
       /* Then, virtual servers */
   
       for (s = s->next; (res == OK) && s; s = s->next) {
           res = open_multi_logs(s, p);
  -    }
  -
  -    /* Finally init buffered logs */
  -    if (buffered_logs) {
  -        all_buffered_logs = apr_array_make(p, 5, sizeof(buffered_log *));
       }
   
       return res;
  
  
  

Mime
View raw message