You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/01 18:13:39 UTC
svn commit: r1648895 - in /tomcat/trunk:
java/org/apache/coyote/http11/AbstractHttp11Processor.java
java/org/apache/coyote/http11/AbstractHttp11Protocol.java
java/org/apache/coyote/http11/AbstractOutputBuffer.java
webapps/docs/config/http.xml
Author: markt
Date: Thu Jan 1 17:13:39 2015
New Revision: 1648895
URL: http://svn.apache.org/r1648895
Log:
Remove references to socketBuffer which appears only to have been used
by BIO.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1648895&r1=1648894&r2=1648895&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu Jan 1 17:13:39 2015
@@ -457,20 +457,6 @@ public abstract class AbstractHttp11Proc
}
/**
- * Set the socket buffer flag.
- */
- public void setSocketBuffer(int socketBuffer) {
- outputBuffer.setSocketBuffer(socketBuffer);
- }
-
- /**
- * Get the socket buffer flag.
- */
- public int getSocketBuffer() {
- return outputBuffer.getSocketBuffer();
- }
-
- /**
* Set the upload timeout.
*/
public void setConnectionUploadTimeout(int timeout) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1648895&r1=1648894&r2=1648895&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu Jan 1 17:13:39 2015
@@ -36,13 +36,6 @@ public abstract class AbstractHttp11Prot
// ------------------------------------------------ HTTP specific properties
// ------------------------------------------ managed in the ProtocolHandler
- private int socketBuffer = 9000;
- public int getSocketBuffer() { return socketBuffer; }
- public void setSocketBuffer(int socketBuffer) {
- this.socketBuffer = socketBuffer;
- }
-
-
/**
* Maximum size of the post which will be saved when processing certain
* requests, such as a POST.
@@ -239,7 +232,6 @@ public abstract class AbstractHttp11Prot
processor.setNoCompressionUserAgents(getNoCompressionUserAgents());
processor.setCompressableMimeTypes(getCompressableMimeTypes());
processor.setRestrictedUserAgents(getRestrictedUserAgents());
- processor.setSocketBuffer(getSocketBuffer());
processor.setMaxSavePostSize(getMaxSavePostSize());
processor.setServer(getServer());
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1648895&r1=1648894&r2=1648895&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu Jan 1 17:13:39 2015
@@ -100,11 +100,6 @@ public abstract class AbstractOutputBuff
protected long byteCount = 0;
/**
- * Socket buffering.
- */
- protected int socketBuffer = -1;
-
- /**
* For "non-blocking" writes use an external set of buffers. Although the
* API only allows one non-blocking write at a time, due to buffering and
* the possible need to write HTTP headers, there may be more than one write
@@ -203,22 +198,6 @@ public abstract class AbstractOutputBuff
}
- /**
- * Set the socket buffer flag.
- */
- public void setSocketBuffer(int socketBuffer) {
- this.socketBuffer = socketBuffer;
- }
-
-
- /**
- * Get the socket buffer flag.
- */
- public int getSocketBuffer() {
- return socketBuffer;
- }
-
-
public void setBufferedWriteSize(int bufferedWriteSize) {
this.bufferedWriteSize = bufferedWriteSize;
}
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1648895&r1=1648894&r2=1648895&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Jan 1 17:13:39 2015
@@ -498,12 +498,6 @@
</p>
</attribute>
- <attribute name="socketBuffer" required="false">
- <p>The size (in bytes) of the buffer to be provided for socket
- output buffering. -1 can be specified to disable the use of a buffer.
- By default, a buffers of 9000 bytes will be used.</p>
- </attribute>
-
<attribute name="SSLEnabled" required="false">
<p>Use this attribute to enable SSL traffic on a connector.
To turn on SSL handshake/encryption/decryption on a connector
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org