Author: mturk
Date: Sun Mar 18 13:26:43 2012
New Revision: 1302122
URL: http://svn.apache.org/viewvc?rev=1302122&view=rev
Log:
Prepend Global prefix so that open/create is reusable
Modified:
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.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=1302122&r1=1302121&r2=1302122&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Sun Mar 18 13:26:43 2012
@@ -210,7 +210,7 @@ int jk_shm_open(const char *fname, size_
shmsz = jk_shmem.size;
jk_shm_map = CreateFileMapping(INVALID_HANDLE_VALUE,
jk_get_sa_with_null_dacl(),
- FILE_MAP_READ | FILE_MAP_WRITE,
+ PAGE_READWRITE,
0,
(DWORD)shmsz,
fname);
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1302122&r1=1302121&r2=1302122&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Mar 18 13:26:43 2012
@@ -55,7 +55,7 @@
#define VERSION_STRING "Jakarta/ISAPI/" JK_EXPOSED_VERSION
#define FULL_VERSION_STRING "Jakarta/ISAPI/" JK_FULL_EXPOSED_VERSION
-#define SHM_DEF_PREFIX "JK_"
+#define SHM_DEF_PREFIX "Global\\JK_"
#define DEFAULT_WORKER_NAME "ajp13"
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
