mod_slotmem_shm: follow up tp r1822509.
authorYann Ylavic <ylavic@apache.org>
Mon, 29 Jan 2018 14:43:21 +0000 (14:43 +0000)
committerYann Ylavic <ylavic@apache.org>
Mon, 29 Jan 2018 14:43:21 +0000 (14:43 +0000)
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

modules/slotmem/mod_slotmem_shm.c

index 88b202d34a782765564c4a57913cb6bb7f3252c0..0b88eea7e8c87daccc9b61f9349e5dd545ac3403 100644 (file)
@@ -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);
         }
     }