diff options
| author | Yann Ylavic <ylavic@apache.org> | 2015-09-15 12:24:24 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2015-09-15 12:24:24 +0000 |
| commit | cda009d56aee52c464dce06dec8f02ba347743c3 (patch) | |
| tree | 11f3fe32c178a1f26f1f11cac223a7359d44885c /modules/slotmem | |
| parent | 10c45ec407f03497ff7f748b00bf054a59e8d796 (diff) | |
| download | httpd-cda009d56aee52c464dce06dec8f02ba347743c3.tar.gz | |
mod_slotmem_shm: follow up to r1702450.
Make systems without unlink() semantic happy by destroying (detaching) the SHM
before removing the base file.
Windows is supposed to have the "delete on last handle closed" semantic but yet
fails here when this handle is owned by the same process (go figure!).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703169 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/slotmem')
| -rw-r--r-- | modules/slotmem/mod_slotmem_shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 29abe2b9a2..4f0eeeaeb9 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -281,11 +281,11 @@ static apr_status_t cleanup_slotmem(void *param) if (AP_SLOTMEM_IS_PERSIST(next)) { store_slotmem(next); } + apr_shm_destroy((apr_shm_t *)next->shm); if (next->fbased) { apr_shm_remove(next->name, next->gpool); apr_file_remove(next->name, next->gpool); } - apr_shm_destroy((apr_shm_t *)next->shm); next = next->next; } } |