cvs commit: apache-1.3/src/modules/standard mod_log_config.c

[dgaudet]

dgaudet     98/06/16 23:39:36

  Modified:    src/modules/standard mod_log_config.c
  Log:
  fix problem with previous fix to the log format stuff... it didn't work
  right in the main server.
  
  PR:           2090
  Submitted by: Christof Damian <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.63      +22 -25    apache-1.3/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- mod_log_config.c  1998/06/14 21:10:27     1.62
  +++ mod_log_config.c  1998/06/17 06:39:34     1.63
  @@ -805,8 +805,6 @@
   {
       multi_log_state *base = (multi_log_state *) basev;
       multi_log_state *add = (multi_log_state *) addv;
  -    const char *format;
  -    const char *dummy;
   
       add->server_config_logs = base->config_logs;
       if (!add->default_format) {
  @@ -815,29 +813,6 @@
       }
       add->formats = ap_overlay_tables(p, base->formats, add->formats);
   
  -    if (add->default_format_string) {
  -     format = ap_table_get(add->formats, add->default_format_string);
  -     if (format) {
  -         add->default_format = parse_log_string(p, format, &dummy);
  -     }
  -    }    
  -
  -    if (add->config_logs) {
  -     config_log_state *clsarray = (config_log_state *) 
add->config_logs->elts;
  -     int i;
  -
  -     for (i = 0; i < add->config_logs->nelts; ++i) {
  -         config_log_state *cls = &clsarray[i];
  -
  -         if (cls->format_string) {
  -             format = ap_table_get(add->formats, cls->format_string);
  -             if (format) {
  -                 cls->format = parse_log_string(p, format, &dummy);
  -             }
  -         }
  -     }
  -    }
  -
       return add;
   }
   
  @@ -957,7 +932,15 @@
                                                &config_log_module);
       config_log_state *clsarray;
       const char *dummy;
  +    const char *format;
   
  +    if (mls->default_format_string) {
  +     format = ap_table_get(mls->formats, mls->default_format_string);
  +     if (format) {
  +         mls->default_format = parse_log_string(p, format, &dummy);
  +     }
  +    }    
  +
       if (!mls->default_format) {
           mls->default_format = parse_log_string(p, DEFAULT_LOG_FORMAT, 
&dummy);
       }
  @@ -967,6 +950,13 @@
           for (i = 0; i < mls->config_logs->nelts; ++i) {
               config_log_state *cls = &clsarray[i];
   
  +         if (cls->format_string) {
  +             format = ap_table_get(mls->formats, cls->format_string);
  +             if (format) {
  +                 cls->format = parse_log_string(p, format, &dummy);
  +             }
  +         }
  +
               cls = open_config_log(s, p, cls, mls->default_format);
           }
       }
  @@ -974,6 +964,13 @@
           clsarray = (config_log_state *) mls->server_config_logs->elts;
           for (i = 0; i < mls->server_config_logs->nelts; ++i) {
               config_log_state *cls = &clsarray[i];
  +
  +         if (cls->format_string) {
  +             format = ap_table_get(mls->formats, cls->format_string);
  +             if (format) {
  +                 cls->format = parse_log_string(p, format, &dummy);
  +             }
  +         }
   
               cls = open_config_log(s, p, cls, mls->default_format);
           }