From: Jim Jagielski <jim@apache.org>
Date: Fri, 8 Nov 2013 14:30:08 +0000 (+0000)
Subject: Ensure that the file-based shm file is removed...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129764924bfbc6404934a03330f5190d0d11f867;p=thirdparty%2Fapache%2Fhttpd.git

Ensure that the file-based shm file is removed...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540051 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index aac96e23d67..ae6daadb1bb 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;