httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1541208 - in /httpd/httpd/branches/2.4.x: ./ modules/slotmem/mod_slotmem_shm.c
Date Tue, 12 Nov 2013 19:35:32 GMT
Author: jim
Date: Tue Nov 12 19:35:32 2013
New Revision: 1541208

URL: http://svn.apache.org/r1541208
Log:
Merge r1540051 from trunk:

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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1540051

Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c?rev=1541208&r1=1541207&r2=1541208&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c Tue Nov 12 19:35:32 2013
@@ -251,7 +251,12 @@ static apr_status_t cleanup_slotmem(void
                 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;



Mime
View raw message