httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Tue, 21 Jan 2003 10:46:57 GMT
minfrin     2003/01/21 02:46:57

  Modified:    modules/experimental util_ldap_cache.c
               .        CHANGES
  Log:
  Fix mod_ldap to open an existing shared memory file should one
  already exist.
  PR: 12757
  Submitted by:	Scooter Morris <scooter@gene.com>
  Reviewed by:	Graham Leggett
  
  Revision  Changes    Path
  1.7       +9 -2      httpd-2.0/modules/experimental/util_ldap_cache.c
  
  Index: util_ldap_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- util_ldap_cache.c	28 Aug 2002 19:16:00 -0000	1.6
  +++ util_ldap_cache.c	21 Jan 2003 10:46:57 -0000	1.7
  @@ -66,7 +66,7 @@
   
   #ifdef APU_HAS_LDAP
   
  -
  +#define MODLDAP_SHMEM_CACHE "/tmp/mod_ldap_cache"
   
   
   /* ------------------------------------------------------------------ */
  @@ -295,7 +295,14 @@
   #if APR_HAS_SHARED_MEMORY
       apr_status_t result;
   
  -    result = apr_shm_create(&util_ldap_shm, reqsize, "/tmp/ldap_cache", pool);
  +    result = apr_shm_create(&util_ldap_shm, reqsize, MODLDAP_SHMEM_CACHE, pool);
  +    if (result == EEXIST) {
  +        /*
  +         * The cache could have already been created (i.e. we may be a child process).
 See
  +         * if we can attach to the existing shared memory
  +         */
  +        result = apr_shm_attach(&util_ldap_shm, MODLDAP_SHMEM_CACHE, pool);
  +    } 
       if (result != APR_SUCCESS) {
           return result;
       }
  
  
  
  1.1030    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1029
  retrieving revision 1.1030
  diff -u -r1.1029 -r1.1030
  --- CHANGES	21 Jan 2003 00:42:53 -0000	1.1029
  +++ CHANGES	21 Jan 2003 10:46:57 -0000	1.1030
  @@ -65,6 +65,10 @@
   
   Changes with Apache 2.0.45
   
  +  *) Fix mod_ldap to open an existing shared memory file should one
  +     already exist. PR 12757. [Scooter Morris <scooter@gene.com>, 
  +     Graham Leggett]
  +
     *) Fix the ulimit command used by apachectl on Tru64.  PR 13609.
        [Joseph Senulis <Joseph.Senulis@dnr.state.wi.us>, Jeff Trawick]
   
  
  
  

Mime
View raw message