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
This commit is contained in:
Yann Ylavic
2015-09-15 12:24:24 +00:00
parent 10c45ec407
commit cda009d56a

View File

@ -281,11 +281,11 @@ static apr_status_t cleanup_slotmem(void *param)
if (AP_SLOTMEM_IS_PERSIST(next)) { if (AP_SLOTMEM_IS_PERSIST(next)) {
store_slotmem(next); store_slotmem(next);
} }
apr_shm_destroy((apr_shm_t *)next->shm);
if (next->fbased) { if (next->fbased) {
apr_shm_remove(next->name, next->gpool); apr_shm_remove(next->name, next->gpool);
apr_file_remove(next->name, next->gpool); apr_file_remove(next->name, next->gpool);
} }
apr_shm_destroy((apr_shm_t *)next->shm);
next = next->next; next = next->next;
} }
} }