Author: violetagg
Date: Thu Aug 11 08:35:18 2016
New Revision: 1755918
URL: http://svn.apache.org/viewvc?rev=1755918&view=rev
Log:
Correct javadoc. Update Connectors configuration page.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java?rev=1755918&r1=1755917&r2=1755918&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java Thu Aug
11 08:35:18 2016
@@ -52,13 +52,13 @@ public class SocketProperties {
/**
* Enable/disable direct buffers for the network buffers
- * Default value is enabled
+ * Default value is disabled
*/
protected boolean directBuffer = false;
/**
* Enable/disable direct buffers for the network buffers for SSL
- * Default value is enabled
+ * Default value is disabled
*/
protected boolean directSslBuffer = false;
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1755918&r1=1755917&r2=1755918&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Aug 11 08:35:18 2016
@@ -694,13 +694,30 @@
<attribute name="socket.directBuffer" required="false">
<p>(bool)Boolean value, whether to use direct ByteBuffers or java
mapped
- ByteBuffers. Default is <code>false</code>.<br/>
+ ByteBuffers. If <code>true</code> then
+ <code>java.nio.ByteBuffer.allocateDirect()</code> is used to allocate
+ the buffers, if <code>false</code> then
+ <code>java.nio.ByteBuffer.allocate()</code> is used. The default value
+ is <code>false</code>.<br/>
When you are using direct buffers, make sure you allocate the
appropriate amount of memory for the direct memory space. On Sun's JDK
that would be something like <code>-XX:MaxDirectMemorySize=256m</code>.
</p>
</attribute>
+ <attribute name="socket.directSslBuffer" required="false">
+ <p>(bool)Boolean value, whether to use direct ByteBuffers or java
mapped
+ ByteBuffers for the SSL buffers. If <code>true</code> then
+ <code>java.nio.ByteBuffer.allocateDirect()</code> is used to allocate
+ the buffers, if <code>false</code> then
+ <code>java.nio.ByteBuffer.allocate()</code> is used. The default value
+ is <code>false</code>.<br/>
+ When you are using direct buffers, make sure you allocate the
+ appropriate amount of memory for the direct memory space. On Oracle's
JDK
+ that would be something like <code>-XX:MaxDirectMemorySize=256m</code>.
+ </p>
+ </attribute>
+
<attribute name="socket.appReadBufSize" required="false">
<p>(int)Each connection that is opened up in Tomcat get associated with
a read ByteBuffer. This attribute controls the size of this buffer. By
@@ -806,7 +823,11 @@
<attribute name="socket.directBuffer" required="false">
<p>(bool)Boolean value, whether to use direct ByteBuffers or java
mapped
- ByteBuffers. Default is <code>false</code>.<br/>
+ ByteBuffers. If <code>true</code> then
+ <code>java.nio.ByteBuffer.allocateDirect()</code> is used to allocate
+ the buffers, if <code>false</code> then
+ <code>java.nio.ByteBuffer.allocate()</code> is used. The default value
+ is <code>false</code>.<br/>
When you are using direct buffers, make sure you allocate the
appropriate amount of memory for the direct memory space. On Sun's JDK
that would be something like <code>-XX:MaxDirectMemorySize=256m</code>.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
