This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 60564ac Quick fix for poller issue reported on users list
60564ac is described below
commit 60564acc0d6b5b739024a540f44d07f04b417f67
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 3 20:44:41 2019 +0100
Quick fix for poller issue reported on users list
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 ++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 4946ea2..2fbdacb 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1534,6 +1534,8 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
boolean reset = false;
int rv = 0;
+ // Reset the nextPollerTime
+ nextPollerTime = pollerTime;
// Iterate on each pollers, but no need to poll empty
pollers
if (pollerSpace[i] < actualPollerSize) {
rv = Poll.poll(pollers[i], nextPollerTime, desc,
true);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index de6e67e..e622fd0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,10 @@
Once a URI is identified as invalid don't attempt to process it
further.
Based on a PR by Alex Repert. (markt)
</fix>
+ <fix>
+ Fix to avoid the possibility of long poll times for individual pollers
+ when using mutliple pollers with APR. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
