diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-01-29 14:43:21 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-01-29 14:43:21 +0000 |
| commit | c75bda95cc200daabef94ac4d000ebe20917b989 (patch) | |
| tree | 5ca5d8a7eca9fae8a3a0e8fa5805aad35dbddb77 /modules/slotmem | |
| parent | ea253a63730ab067d1fb841d40f9d3b0479a96b7 (diff) | |
| download | httpd-c75bda95cc200daabef94ac4d000ebe20917b989.tar.gz | |
mod_slotmem_shm: follow up tp r1822509.
Please buildbot (and incidentally users of older APR) by using
apr_shm_remove() instead of the new(er) apr_shm_delete().
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822511 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/slotmem')
| -rw-r--r-- | modules/slotmem/mod_slotmem_shm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 88b202d34a..0b88eea7e8 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -317,11 +317,10 @@ static apr_status_t cleanup_slotmem(void *is_startup) } if (unlink) { /* Some systems may require the descriptor to be closed before - * unlink, thus call destroy() first (this won't free mem->shm - * so it's safe to call delete() afterward). + * unlink, thus call destroy() first. */ apr_shm_destroy(mem->shm); - apr_shm_delete(mem->shm); + apr_shm_remove(mem->name, mem->pool); } } |