This is an automated email from the ASF dual-hosted git repository.
remm 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 c5bf32a Restore original maxConnections default for NIO2
c5bf32a is described below
commit c5bf32a63d7c0cd8b9776b367dbc1030cba209d1
Author: remm <r...@apache.org>
AuthorDate: Mon Mar 25 16:23:07 2019 +0100
Restore original maxConnections default for NIO2
The underlying close issues are believed to be fixed. The default is now
again what is officially documented. It is likely the best NIO2 default
remains -1 though, the limitation set here is likely not useful in any
way.
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 7 -------
webapps/docs/changelog.xml | 4 ++++
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 161d660..ea4a8ef 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -89,13 +89,6 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
private Nio2Acceptor acceptor = null;
- public Nio2Endpoint() {
- // Override the defaults for NIO2
- // Disable maxConnections by default for NIO2 (see BZ58103)
- setMaxConnections(-1);
- }
-
-
// ------------------------------------------------------------- Properties
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5c5331c..ae2b56d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -97,6 +97,10 @@
<fix>
Refactor NIO2 write pending strategy for the classic IO API. (remm)
</fix>
+ <fix>
+ Restore original maxConnections default for NIO2 as the underlying
+ close issues have been fixed. (remm)
+ </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
