You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/29 14:43:21 UTC

svn commit: r1822511 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Author: ylavic
Date: Mon Jan 29 14:43:21 2018
New Revision: 1822511

URL: http://svn.apache.org/viewvc?rev=1822511&view=rev
Log:
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().


Modified:
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1822511&r1=1822510&r2=1822511&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Mon Jan 29 14:43:21 2018
@@ -317,11 +317,10 @@ static apr_status_t cleanup_slotmem(void
         }
         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);
         }
     }