From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 29 Jan 2018 14:43:21 +0000 (+0000)
Subject: mod_slotmem_shm: follow up tp r1822509.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2916
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c75bda95cc200daabef94ac4d000ebe20917b989;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 88b202d34a7..0b88eea7e8c 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);
         }
     }