Author: markt
Date: Tue Aug 21 17:39:32 2018
New Revision: 1838573
URL: http://svn.apache.org/viewvc?rev=1838573&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58287
Common: Use Local, rather than Global, mutexs on Windows to better support
multi-user environments.
Modified:
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1838573&r1=1838572&r2=1838573&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Tue Aug 21 17:39:32 2018
@@ -223,7 +223,7 @@ int jk_shm_open(const char *fname, int s
if (fname) {
int i;
SIZE_T shmsz = 0;
- strcpy(shname, "Global\\");
+ strcpy(shname, "Local\\");
strncat(shname, fname, MAX_PATH - 8);
for(i = 7; i < (int)strlen(shname); i++) {
if (!jk_isalnum(shname[i]))
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=1838573&r1=1838572&r2=1838573&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Aug 21 17:39:32 2018
@@ -2341,7 +2341,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
*p = '\0';
StringCbCopy(ini_file_name, MAX_PATH, fname);
StringCbCat(ini_file_name, MAX_PATH, ".properties");
- StringCbCopy(ini_mutex_name, MAX_PATH, "Global\\JK_");
+ StringCbCopy(ini_mutex_name, MAX_PATH, "Local\\JK_");
StringCbCat(ini_mutex_name, MAX_PATH, fname);
StringCbCat(ini_mutex_name, MAX_PATH, "_mutex");
p = &ini_mutex_name[10];
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1838573&r1=1838572&r2=1838573&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Aug 21 17:39:32 2018
@@ -50,6 +50,10 @@
over five years. (markt)
</update>
<fix>
+ <bug>58287</bug>: Common: Use Local, rather than Global, mutexs on
+ Windows to better support multi-user environments. (markt)
+ </fix>
+ <fix>
<bug>60745</bug>: ISAPI: Remove the check that rejects requests that
contain path segments that match WEB-INF or META-INF as it duplicates
a check that Tomcat performs and, because ISAPI does not have
visibility
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
