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/server/mpm/prefork prefork.c
Date Fri, 07 Nov 2003 13:40:04 GMT
trawick     2003/11/07 05:40:04

  Modified:    .        CHANGES
               server/mpm/prefork prefork.c
  Log:
  Fix uninitialized gprof directory name in prefork MPM.
  
  PR:           24450
  Submitted by: Chris Knight <Christopher.D.Knight@nasa.gov>
  Reviewed by:  Jeff Trawick
  
  Revision  Changes    Path
  1.1312    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1311
  retrieving revision 1.1312
  diff -u -r1.1311 -r1.1312
  --- CHANGES	6 Nov 2003 20:45:56 -0000	1.1311
  +++ CHANGES	7 Nov 2003 13:40:04 -0000	1.1312
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Fix uninitialized gprof directory name in prefork MPM.  PR 24450.
  +     [Chris Knight <Christopher.D.Knight@nasa.gov>]
  +
     *) mod_auth_ldap: Fix some segfaults in the cache logic.  PR 18756.
        [Matthieu Estrade <apache@moresecurity.org>]
   
  
  
  
  1.281     +4 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.280
  retrieving revision 1.281
  diff -u -r1.280 -r1.281
  --- prefork.c	22 Oct 2003 11:38:46 -0000	1.280
  +++ prefork.c	7 Nov 2003 13:40:04 -0000	1.281
  @@ -203,7 +203,10 @@
   	if(*(dir + len) == '%') {
   	    dir[len] = '\0';
   	    apr_snprintf(buf, sizeof(buf), "%sgprof.%d", dir, (int)getpid());
  -	} 
  +	}
  +        else {
  +            buf[0] = '\0';
  +        }
   	use_dir = ap_server_root_relative(pconf, buf[0] ? buf : dir);
   	res = apr_dir_make(use_dir,
                              APR_UREAD | APR_UWRITE | APR_UEXECUTE |
  
  
  

Mime
View raw message