httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: httpd-2.0/server main.c core.c
Date Tue, 08 Jan 2002 17:07:20 GMT
dreid       02/01/08 09:07:19

  Modified:    server   main.c core.c
  Log:
  Restore the apr_pool_clear calls to main.c in case we have
  third-parties who are overriding the open_logs hook, in which case
  they'd miss the plog being cleared.
  
  Submitted by:	Justin <jerenkrantz@apache.org>
  
  Revision  Changes    Path
  1.113     +2 -0      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- main.c	8 Jan 2002 16:30:16 -0000	1.112
  +++ main.c	8 Jan 2002 17:07:19 -0000	1.113
  @@ -411,6 +411,7 @@
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n");
   	destroy_and_exit_process(process, 0);
       }
  +    apr_pool_clear(plog);
       if ( ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {
           ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR| APLOG_NOERRNO, 0, NULL, "Unable
to open logs\n");
           destroy_and_exit_process(process, 1);
  @@ -442,6 +443,7 @@
           ap_fixup_virtual_hosts(pconf, server_conf);
           ap_fini_vhost_config(pconf, server_conf);
           apr_sort_hooks();
  +        apr_pool_clear(plog);
           if ( ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {
               ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR| APLOG_NOERRNO, 0, NULL,
"Unable to open logs\n");
               destroy_and_exit_process(process, 1);
  
  
  
  1.128     +0 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- core.c	8 Jan 2002 16:30:16 -0000	1.127
  +++ core.c	8 Jan 2002 17:07:19 -0000	1.128
  @@ -3361,7 +3361,6 @@
   
   static int core_open_logs(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec
*s)
   {
  -    apr_pool_clear(plog);
       ap_open_logs(s, plog);
       return OK;  
   }
  
  
  

Mime
View raw message