From: Jim Jagielski <jim@apache.org>
Date: Tue, 12 Nov 2013 19:35:32 +0000 (+0000)
Subject: Merge r1540051 from trunk:
X-Git-Tag: 2.4.7~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a0587ee4a5b1f9bc0589152a516921cd3d6876e;p=apache

Merge r1540051 from trunk:

Ensure that the file-based shm file is removed...
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1541208 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index aac96e23d6..ae6daadb1b 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -251,7 +251,12 @@ static apr_status_t cleanup_slotmem(void *param)
                 store_slotmem(next);
             }
             if (next->fbased) {
+                const char *name;
                 apr_shm_remove(next->name, next->gpool);
+                name = slotmem_filename(next->gpool, next->name, 0);
+                if (name) {
+                    apr_file_remove(name, next->gpool);
+                }
             }
             apr_shm_destroy((apr_shm_t *)next->shm);
             next = next->next;