Author: rjung Date: Fri Sep 18 12:16:19 2009 New Revision: 816596 URL: http://svn.apache.org/viewvc?rev=816596&view=rev Log: Fix BZ47867: IIS crashes during startup, when compiled with VS2008 and workers.properties contains unsupported properties. Patch provided by Indrek Juhani
Modified: tomcat/jk/trunk/native/common/jk_util.c tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/common/jk_util.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=816596&r1=816595&r2=816596&view=diff ============================================================================== --- tomcat/jk/trunk/native/common/jk_util.c (original) +++ tomcat/jk/trunk/native/common/jk_util.c Fri Sep 18 12:16:19 2009 @@ -320,7 +320,8 @@ RETRIES_OF_WORKER, STATUS_FAIL_OF_WORKER, LIST_PROPERTY_NAME, - MAINTAIN_PROPERTY_NAME + MAINTAIN_PROPERTY_NAME, + NULL }; static const char *jk_level_verbs[] = { Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=816596&r1=816595&r2=816596&view=diff ============================================================================== --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri Sep 18 12:16:19 2009 @@ -43,6 +43,12 @@ <br /> <subsection name="Native"> <changelog> + <fix> + <bug>47867</bug>: IIS: crash during startup, when compiled with VS2008 + and workers.properties contains unsupported properties. + Patch provided by Indrek Juhani (rjung) + </fix> + <fix> <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) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org