Author: mturk
Date: Wed Aug 12 05:49:54 2009
New Revision: 803365
URL: http://svn.apache.org/viewvc?rev=803365&view=rev
Log:
Fix #47628. Apply slightly modified patch provided by Brett Prucha
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=803365&r1=803364&r2=803365&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Wed Aug 12 05:49:54 2009
@@ -563,7 +563,7 @@
static int init_jk(char *serverName);
-static int initialize_extension(void);
+static BOOL initialize_extension(void);
static int read_registry_init_data(void);
@@ -2089,6 +2089,7 @@
BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO * pVer)
{
int rc;
+ BOOL rv = TRUE;
pVer->dwExtensionVersion = MAKELONG(HSE_VERSION_MINOR, HSE_VERSION_MAJOR);
@@ -2097,11 +2098,11 @@
JK_ENTER_CS(&(init_cs), rc);
if (!is_inited) {
- return initialize_extension();
+ rv = initialize_extension();
}
JK_LEAVE_CS(&(init_cs), rc);
- return TRUE;
+ return rv;
}
DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpEcb)
@@ -2574,7 +2575,7 @@
return rc;
}
-static int initialize_extension(void)
+static BOOL initialize_extension(void)
{
if (read_registry_init_data()) {
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=803365&r1=803364&r2=803365&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 12 05:49:54 2009
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <bug>47628</bug>: IIS: Fix deadlock when restarting the Application
Pool
+ caused by not releasing the critical section lock.
+ Patch provided by Bret Prucha. (mturk)
+ </fix>
<fix>
Status: Remove duplicate "errors" line in property view of
AJP13 workers that are part of a load balancer. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
