This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 831cf3e Remove NioSelectorShared leftovers 831cf3e is described below commit 831cf3e39312f8ad63778454c259c26910e93c0e Author: remm <r...@apache.org> AuthorDate: Wed Aug 18 11:01:08 2021 +0200 Remove NioSelectorShared leftovers --- build.properties.default | 4 ---- build.xml | 1 - webapps/docs/config/ajp.xml | 25 ------------------------- 3 files changed, 30 deletions(-) diff --git a/build.properties.default b/build.properties.default index 2d9bac4..c05a246 100644 --- a/build.properties.default +++ b/build.properties.default @@ -69,10 +69,6 @@ execute.findbugs=false # multicast tests to work java.net.preferIPv4Stack=false -# Specify the default (true) else the empty string will be used which -# effectively changes the setting to false -org.apache.tomcat.util.net.NioSelectorShared=true - # Location of GPG executable (used only for releases) gpg.exec=/path/to/gpg diff --git a/build.xml b/build.xml index fd96d8d..3c48d90 100644 --- a/build.xml +++ b/build.xml @@ -1956,7 +1956,6 @@ <jvmarg value="-Djava.library.path=${test.apr.loc}"/> <jvmarg value="${test.formatter}"/> <jvmarg value="-Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/> - <jvmarg value="-Dorg.apache.tomcat.util.net.NioSelectorShared=${org.apache.tomcat.util.net.NioSelectorShared}"/> <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/> <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED"/> <jvmarg value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/> diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml index 1b678cd..81c825a 100644 --- a/webapps/docs/config/ajp.xml +++ b/webapps/docs/config/ajp.xml @@ -708,31 +708,6 @@ <code>-1</code> for unlimited cache and <code>0</code> for no cache.</p> </attribute> - <attribute name="selectorPool.maxSelectors" required="false"> - <p>(int)The max selectors to be used in the pool, to reduce selector - contention. Use this option when the command line - <code>org.apache.tomcat.util.net.NioSelectorShared</code> value is set - to false. Default value is <code>200</code>.</p> - </attribute> - - <attribute name="selectorPool.maxSpareSelectors" required="false"> - <p>(int)The max spare selectors to be used in the pool, to reduce - selector contention. When a selector is returned to the pool, the system - can decide to keep it or let it be GC'd. Use this option when the - command line <code>org.apache.tomcat.util.net.NioSelectorShared</code> - value is set to false. Default value is <code>-1</code> (unlimited).</p> - </attribute> - - <attribute name="command-line-options" required="false"> - <p>The following command line options are available for the NIO - connector:<br/> - <code>-Dorg.apache.tomcat.util.net.NioSelectorShared=true|false</code> - - default is <code>true</code>. Set this value to <code>false</code> if you wish to - use a selector for each thread. When you set it to <code>false</code>, you can - control the size of the pool of selectors by using the - <strong>selectorPool.maxSelectors</strong> attribute.</p> - </attribute> - </attributes> </subsection> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org