www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

* modules/ldap/util_ldap.c (util_ldap_post_config): Don't attempt to

Browse Source 
remove the shm segment here.

* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Properly
remove the shm segment here before creating a new one; don't attach to
any existing shm segment if apr_shm_create() fails.
(util_ldap_cache_module_kill): Don't attempt to remove the shm segment
here; apr_shm_destroy() does that anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226809 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2005-08-01 14:50:21 +00:00
parent 8fab5eceba
commit 01acb7f836
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ldap/util_ldap.c
View File

@@ -1817,7 +1817,6 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
if (st->cache_file) { if (st->cache_file) {
char *lck_file = apr_pstrcat(st->pool, st->cache_file, ".lck", char *lck_file = apr_pstrcat(st->pool, st->cache_file, ".lck",
NULL); NULL);
apr_file_remove(st->cache_file, ptemp);
apr_file_remove(lck_file, ptemp); apr_file_remove(lck_file, ptemp);
} }
#endif #endif

13
modules/ldap/util_ldap_cache.c
View File

@@ -391,9 +391,6 @@ static apr_status_t util_ldap_cache_module_kill(void *data)
if (st->cache_shm != NULL) { if (st->cache_shm != NULL) {
apr_status_t result = apr_shm_destroy(st->cache_shm); apr_status_t result = apr_shm_destroy(st->cache_shm);
st->cache_shm = NULL; st->cache_shm = NULL;
if (st->cache_file) {
apr_file_remove(st->cache_file, st->pool);
}
return result; return result;
} }
#endif #endif
@@ -406,16 +403,12 @@ apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st)
apr_status_t result; apr_status_t result;
apr_size_t size; apr_size_t size;
/* Remove any existing shm segment with this name. */
apr_shm_remove(st->cache_file, st->pool);
size = APR_ALIGN_DEFAULT(st->cache_bytes); size = APR_ALIGN_DEFAULT(st->cache_bytes);
result = apr_shm_create(&st->cache_shm, size, st->cache_file, st->pool); 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
* if we can attach to the existing shared memory
*/
result = apr_shm_attach(&st->cache_shm, st->cache_file, st->pool);
}
if (result != APR_SUCCESS) { if (result != APR_SUCCESS) {
return result; return result;
} }