Commit bd74a991 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r225753 from trunk: 

* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Use the
actual available size of the shm segment not the requested size.
Ensure the requested size is aligned.  Check errors from apr_rmm_init.

Reviewed by: jorton, minfrin, bnicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@230474 13f79535-47bb-0310-9956-ffa450edef68
parent ccb640f5

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Changes with Apache 2.0.55 
  *) mod_proxy: Fix over-eager handling of '%' for reverse proxies.

     PR 15207.  [Jim Jagielski]













  *) mod_ldap: Fix a possible crash in shared memory cache handling.













  *) mod_ldap: Fix various shared memory cache handling bugs.















     PR 34209.  [Joe Orton]





























  *) Fix a file descriptor leak when starting piped loggers.  PR 33748. 

































STATUS



+0
−5






























Original line number
Diff line number
Diff line








@@ -370,11 +370,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:













        http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev















        +1: pquerna





























     *) mod_ldap: Use the correct shm segment size, fail on













        apr_rmm_init errors.













        http://svn.apache.org/viewcvs?rev=225753&view=rev













        +1: jorton, minfrin, bnicholes





























     *) mod_ldap: Initialize mutex permissions properly so that















        locking actually works.















        http://svn.apache.org/viewcvs?rev=105412&view=rev

































modules/experimental/util_ldap_cache.c



+14
−2






























Original line number
Diff line number
Diff line








@@ -397,8 +397,11 @@ apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st)













{















#if APR_HAS_SHARED_MEMORY















    apr_status_t result;













    apr_size_t size;





























    result = apr_shm_create(&st->cache_shm, st->cache_bytes, st->cache_file, st->pool);













    size = APR_ALIGN_DEFAULT(st->cache_bytes);



























    result = apr_shm_create(&st->cache_shm, size, st->cache_file, st->pool);















    if (result == APR_EEXIST) {















        /*















         * The cache could have already been created (i.e. we may be a child process).  See









@@ -410,8 +413,17 @@ apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st)













        return result;















    }





























    /* Determine the usable size of the shm segment. */













    size = apr_shm_size_get(st->cache_shm);





























    /* This will create a rmm "handler" to get into the shared memory area */













    apr_rmm_init(&st->cache_rmm, NULL, (void *)apr_shm_baseaddr_get(st->cache_shm), st->cache_bytes, st->pool);













    result = apr_rmm_init(&st->cache_rmm, NULL, 













                          apr_shm_baseaddr_get(st->cache_shm), size, 













                          st->pool);













    if (result != APR_SUCCESS) {













        return result;













    }





























#endif































    apr_pool_cleanup_register(st->pool, st , util_ldap_cache_module_kill, apr_pool_cleanup_null);