Author: mturk
Date: Tue Nov 8 16:57:05 2011
New Revision: 1199345
URL: http://svn.apache.org/viewvc?rev=1199345&view=rev
Log:
Revert accidental removal of real shm size. Also make sure we actually map the
requested size
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=1199345&r1=1199344&r2=1199345&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Tue Nov 8 16:57:05 2011
@@ -167,6 +167,7 @@ int jk_shm_open(const char *fname, size_
JK_LEAVE_CS(&jk_shmem.cs, rc);
return 0;
}
+ jk_shmem.size = JK_SHM_ALIGN(sizeof(jk_shm_header_t) + sz);
#if defined (WIN32)
if (fname) {
sprintf(lkname, "Global\\%s_MUTEX", fname);
@@ -198,7 +199,7 @@ int jk_shm_open(const char *fname, size_
jk_get_sa_with_null_dacl(),
PAGE_READWRITE,
0,
- (DWORD)(sizeof(jk_shm_header_t) +
sz),
+ (DWORD)jk_shmem.size,
fname);
}
if (jk_shm_map == NULL || jk_shm_map == INVALID_HANDLE_VALUE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
