You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/02/07 20:32:31 UTC
svn commit: r1068072 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
Author: jim
Date: Mon Feb 7 19:32:31 2011
New Revision: 1068072
URL: http://svn.apache.org/viewvc?rev=1068072&view=rev
Log:
Only persist if we want it to
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=1068072&r1=1068071&r2=1068072&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Mon Feb 7 19:32:31 2011
@@ -43,6 +43,7 @@
#endif
#define AP_SLOTMEM_IS_PREGRAB(t) (t->desc.type & AP_SLOTMEM_TYPE_PREGRAB)
+#define AP_SLOTMEM_IS_PERSIST(t) (t->desc.type & AP_SLOTMEM_TYPE_PERSIST)
/* The description of the slots to reuse the slotmem */
typedef struct {
@@ -208,7 +209,9 @@ static apr_status_t cleanup_slotmem(void
ap_slotmem_instance_t *next = *mem;
apr_pool_t *p = next->gpool;
while (next) {
- store_slotmem(next);
+ if (AP_SLOTMEM_IS_PERSIST(next)) {
+ store_slotmem(next);
+ }
apr_shm_destroy((apr_shm_t *)next->shm);
next = next->next;
}