Author: mturk
Date: Sun Mar 18 17:33:27 2012
New Revision: 1302175
URL: http://svn.apache.org/viewvc?rev=1302175&view=rev
Log:
Do not presume shared memory is reset on create
Modified:
tomcat/jk/trunk/native/common/jk_shm.c
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1302175&r1=1302174&r2=1302175&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Sun Mar 18 17:33:27 2012
@@ -291,9 +291,9 @@ int jk_shm_open(const char *fname, size_
jk_shmem.hdr->h.data.childs);
}
}
- jk_shmem.hdr->h.data.pos = 0;
- jk_shmem.hdr->h.data.workers = 0;
}
+ jk_shmem.hdr->h.data.pos = 0;
+ jk_shmem.hdr->h.data.workers = 0;
#if defined (WIN32)
if (jk_shm_hlock != NULL) {
/* Unlock shared memory */
@@ -485,7 +485,7 @@ static int do_shm_open(const char *fname
if (!jk_shm_inited_cs) {
jk_shm_inited_cs = 1;
JK_INIT_CS(&jk_shmem.cs, rc);
- }
+ }
if (jk_shmem.hdr) {
/* Probably a call from vhost */
if (!attached)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
