You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/09/12 19:06:53 UTC
svn commit: r1760437 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c
xdocs/miscellaneous/changelog.xml
Author: markt
Date: Mon Sep 12 19:06:52 2016
New Revision: 1760437
URL: http://svn.apache.org/viewvc?rev=1760437&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58813
Correctly release a mutex allowing the plugin to complete initialization. Prior to this fix, the incomplete initialization was causing a hang on shutdown.
Patch provided by Matthew Reiter.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
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=1760437&r1=1760436&r2=1760437&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Sep 12 19:06:52 2016
@@ -2319,7 +2319,7 @@ BOOL WINAPI TerminateFilter(DWORD dwFlag
jk_close_file_logger(&logger);
}
}
- ReleaseMutex(&init_cs);
+ ReleaseMutex(init_cs);
LeaveCriticalSection(&log_cs);
return TRUE;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1760437&r1=1760436&r2=1760437&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 12 19:06:52 2016
@@ -74,6 +74,12 @@
was introduced by the fix to <bug>44454</bug> and <bug>56703</bug>.
(rjung)
</fix>
+ <fix>
+ <bug>58813</bug>: ISAPI: Correctly release a mutex allowing the plugin
+ to complete initialization. Prior to this fix, the incomplete
+ initialization was causing a hang on shutdown. Patch provided by Matthew
+ Reiter. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org