Author: markt
Date: Fri Sep 16 08:42:03 2016
New Revision: 1761010
URL: http://svn.apache.org/viewvc?rev=1761010&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58504
If a background thread is used to perform worker maintenance, ensure that
maintenance runs are not skipped.
Patch provided by Hiroto Shimizu.
Modified:
tomcat/jk/trunk/native/common/jk_shm.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=1761010&r1=1761009&r2=1761010&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Fri Sep 16 08:42:03 2016
@@ -878,7 +878,7 @@ int jk_shm_check_maintain(time_t trigger
JK_ATOMIC_DECREMENT(&(jk_shmem.hdr->h.data.maintain_checking));
return rv;
}
- if (jk_shmem.hdr->h.data.maintain_time < trigger) {
+ if (jk_shmem.hdr->h.data.maintain_time <= trigger) {
jk_shmem.hdr->h.data.maintain_time = time(NULL);
rv = JK_TRUE;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761010&r1=1761009&r2=1761010&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri Sep 16 08:42:03 2016
@@ -75,6 +75,11 @@
(rjung)
</fix>
<fix>
+ <bug>58504</bug>: If a background thread is used to perform worker
+ maintenance, ensure that maintenance runs are not skipped. Patch
+ provided by Hiroto Shimizu. (markt)
+ </fix>
+ <fix>
<bug>58608</bug>: ISAPI: Add a new registry option "flush_packets"
that allows the flushing behaviour of IIS7+ to be controlled. The
default is not to flush. Setting the option to "true" with cause IIS to
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
