[tomcat] branch 10.1.x updated: Fix javadoc and documentation.

[lihan]

This is an automated email from the ASF dual-hosted git repository.

lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 5d6e0ea5c8 Fix javadoc and documentation.
5d6e0ea5c8 is described below

commit 5d6e0ea5c86c43110e3efeeb4d2cc110131c8b3a
Author: lihan <li...@apache.org>
AuthorDate: Fri Sep 1 10:43:45 2023 +0800

    Fix javadoc and documentation.
    
    Update the default value of 'socket.processorCache' and 'socket.eventCache' 
in the documentation and javadoc. And remove 'socket.keyCache' from the AJP 
documentation.
    
    (cherry picked from commit ca095d52c98c2e25005990a9ef02240a823f0334)
---
 java/org/apache/tomcat/util/net/SocketProperties.java |  8 ++++----
 webapps/docs/config/ajp.xml                           | 13 +++----------
 webapps/docs/config/http.xml                          |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SocketProperties.java 
b/java/org/apache/tomcat/util/net/SocketProperties.java
index 1cdb2c6302..b91d54f0e2 100644
--- a/java/org/apache/tomcat/util/net/SocketProperties.java
+++ b/java/org/apache/tomcat/util/net/SocketProperties.java
@@ -36,7 +36,7 @@ public class SocketProperties {
     /**
      * Enable/disable socket processor cache, this bounded cache stores
      * SocketProcessor objects to reduce GC
-     * Default is 500
+     * Default is 0
      * -1 is unlimited
      * 0 is disabled
      */
@@ -45,7 +45,7 @@ public class SocketProperties {
     /**
      * Enable/disable poller event cache, this bounded cache stores
      * PollerEvent objects to reduce GC for the poller
-     * Default is 500
+     * Default is 0
      * -1 is unlimited
      * 0 is disabled
      * &gt;0 the max number of objects to keep in cache.
@@ -78,13 +78,13 @@ public class SocketProperties {
 
     /**
      * The application read buffer size in bytes.
-     * Default value is rxBufSize
+     * Default value is 8192
      */
     protected int appReadBufSize = 8192;
 
     /**
      * The application write buffer size in bytes
-     * Default value is txBufSize
+     * Default value is 8192
      */
     protected int appWriteBufSize = 8192;
 
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index b704c9e733..aff9f44a6a 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -724,21 +724,14 @@
       <attribute name="socket.processorCache" required="false">
         <p>(int)Tomcat will cache SocketProcessor objects to reduce garbage
         collection. The integer value specifies how many objects to keep in the
-        cache at most. The default is <code>500</code>. Other values are
-        <code>-1</code> for unlimited cache and <code>0</code> for no 
cache.</p>
-      </attribute>
-
-      <attribute name="socket.keyCache" required="false">
-        <p>(int)Tomcat will cache KeyAttachment objects to reduce garbage
-        collection. The integer value specifies how many objects to keep in the
-        cache at most. The default is <code>500</code>. Other values are
+        cache at most. The default is <code>0</code>. Other values are
         <code>-1</code> for unlimited cache and <code>0</code> for no 
cache.</p>
       </attribute>
 
       <attribute name="socket.eventCache" required="false">
         <p>(int)Tomcat will cache PollerEvent objects to reduce garbage
         collection. The integer value specifies how many objects to keep in the
-        cache at most. The default is <code>500</code>. Other values are
+        cache at most. The default is <code>0</code>. Other values are
         <code>-1</code> for unlimited cache and <code>0</code> for no 
cache.</p>
       </attribute>
 
@@ -798,7 +791,7 @@
       <attribute name="socket.processorCache" required="false">
         <p>(int)Tomcat will cache SocketProcessor objects to reduce garbage
         collection. The integer value specifies how many objects to keep in the
-        cache at most. The default is <code>500</code>. Other values are
+        cache at most. The default is <code>0</code>. Other values are
         <code>-1</code> for unlimited cache and <code>0</code> for no 
cache.</p>
       </attribute>
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 6f71e36dd0..30101b80d8 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1033,7 +1033,7 @@
       <attribute name="socket.processorCache" required="false">
         <p>(int)Tomcat will cache SocketProcessor objects to reduce garbage
         collection. The integer value specifies how many objects to keep in the
-        cache at most. The default is <code>500</code>. Other values are
+        cache at most. The default is <code>0</code>. Other values are
         <code>-1</code> for unlimited cache and <code>0</code> for no 
cache.</p>
       </attribute>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org