httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/loggers mod_log_config.c
Date Sat, 14 Sep 2002 20:36:30 GMT
wrowe       2002/09/14 13:36:30

  Modified:    modules/loggers mod_log_config.c
  Log:
    At least follow the proper failure path for failure to open the log file
    or logging process.  Doesn't fix the lack of preflight testing.
  
  Reviewed by: Ian Holsman
  
  Revision  Changes    Path
  1.92      +7 -3      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.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- mod_log_config.c	6 Sep 2002 03:00:10 -0000	1.91
  +++ mod_log_config.c	14 Sep 2002 20:36:30 -0000	1.92
  @@ -1098,7 +1098,7 @@
       
       cls->log_writer = log_writer_init(p, s, cls->fname);
       if (cls->log_writer == NULL)
  -        exit(1); 
  +        return NULL; 
   
       return cls;
   }
  @@ -1135,7 +1135,9 @@
   		}
   	    }
   
  -            cls = open_config_log(s, p, cls, mls->default_format);
  +            if (open_config_log(s, p, cls, mls->default_format))
  +                return (apr_pstrcat(p, "Failed to initialize custom log to ", 
  +                                    cls->fname));
           }
       }
       else if (mls->server_config_logs) {
  @@ -1150,7 +1152,9 @@
   		}
   	    }
   
  -            cls = open_config_log(s, p, cls, mls->default_format);
  +            if (open_config_log(s, p, cls, mls->default_format))
  +                return (apr_pstrcat(p, "Failed to initialize custom log to ", 
  +                                    cls->fname));
           }
       }
   
  
  
  

Mime
View raw message