This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 93b8894 Remove unnecessary code 93b8894 is described below commit 93b8894360a93c41f5c5afc406924b70a5d8c18f Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Aug 14 17:47:08 2019 +0100 Remove unnecessary code All currently supported versions of Windows support large pollsets --- java/org/apache/tomcat/util/net/AprEndpoint.java | 14 ++------------ webapps/docs/changelog.xml | 9 +++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 2075783..46c7047 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -1639,25 +1639,15 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB private volatile boolean sendfileRunning = true; /** - * Create the sendfile poller. With some versions of APR, the maximum - * poller size will be 62 (recompiling APR is necessary to remove this - * limitation). + * Create the sendfile poller. */ protected void init() { pool = Pool.create(serverSockPool); int size = sendfileSize; if (size <= 0) { - size = (OS.IS_WIN32 || OS.IS_WIN64) ? (1 * 1024) : (16 * 1024); + size = 16 * 1024; } sendfilePollset = allocatePoller(size, pool, getConnectionTimeout()); - if (sendfilePollset == 0 && size > 1024) { - size = 1024; - sendfilePollset = allocatePoller(size, pool, getConnectionTimeout()); - } - if (sendfilePollset == 0) { - size = 62; - sendfilePollset = allocatePoller(size, pool, getConnectionTimeout()); - } desc = new long[size * 2]; sendfileData = new HashMap<>(size); addS = new ArrayList<>(); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 678a821..79c3667 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -45,6 +45,15 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 9.0.24 (markt)" rtext="in development"> + <subsection name="Coyote"> + <changelog> + <scode> + Remove the code in the sendfile poller that ensured smaller pollsets + were used with older, no longer supported versions of Windows that + could not support larger pollsets. (markt) + </scode> + </changelog> + </subsection> </section> <section name="Tomcat 9.0.23 (markt)" rtext="release in progress"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org