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 16:30:16 GMT
dreid       02/01/08 08:30:16

  Modified:    server   main.c core.c
  Log:
  This small patch modifies the log's to use plog instead of pconf.
  Basically pconf is cleared at different times from plog, and this
  has the effect of leaving stderr closed when going into the next
  stage of the config. This also had the effect of allowing FreeBSD
  with threads to create a pipe with stderr's fd at one end, and this
  resulted in problems with the signal polling and high cpu usage.
  
  In addition, move the clearing of plog from main.c to core.c where
  it seems more appropriate.
  
  This solves the first and main problem that FreeBSD has with the
  threaded MPM's.
  
  Revision  Changes    Path
  1.112     +0 -2      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- main.c	18 Dec 2001 20:26:15 -0000	1.111
  +++ main.c	8 Jan 2002 16:30:16 -0000	1.112
  @@ -411,7 +411,6 @@
   	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);
  @@ -443,7 +442,6 @@
           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.127     +2 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- core.c	2 Jan 2002 07:56:25 -0000	1.126
  +++ core.c	8 Jan 2002 16:30:16 -0000	1.127
  @@ -3361,7 +3361,8 @@
   
   static int core_open_logs(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec
*s)
   {
  -    ap_open_logs(s, pconf);
  +    apr_pool_clear(plog);
  +    ap_open_logs(s, plog);
       return OK;  
   }
   
  
  
  

Mime
View raw message