]> granicus.if.org Git - apache/commit
Merge r1387085 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 22 Oct 2012 16:54:46 +0000 (16:54 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 22 Oct 2012 16:54:46 +0000 (16:54 +0000)
commitd8e045e85472c17623951b079c0cb8ed20b0b6c3
tree29fdbbf7c36d011cb2fbb6a7ea712a3797d50e43
parent0aac264c8ae42b9199da66240abc4f94108f1ff5
Merge r1387085 from trunk:

Use our private function and just allow for conditonal
concat of .persist suffix

Reviewed/backported by: jim
Merge r1386726 from trunk:

Add debug output when slotmem is persisting shm

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1400951 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/slotmem/mod_slotmem_shm.c