Author: markt
Date: Fri Jan 9 12:22:54 2015
New Revision: 1650512
URL: http://svn.apache.org/r1650512
Log:
Remove unused configuration setting since the recent refactoring removed a
layer of buffering
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
tomcat/trunk/webapps/docs/config/http.xml
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=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri
Jan 9 12:22:54 2015
@@ -175,17 +175,6 @@ public abstract class AbstractHttp11Prot
}
- /**
- * The size of the buffer used by the ServletOutputStream when performing
- * delayed asynchronous writes using HTTP upgraded connections.
- */
- private int upgradeAsyncWriteBufferSize = 8192;
- public int getUpgradeAsyncWriteBufferSize() { return
upgradeAsyncWriteBufferSize; }
- public void setUpgradeAsyncWriteBufferSize(int
upgradeAsyncWriteBufferSize) {
- this.upgradeAsyncWriteBufferSize = upgradeAsyncWriteBufferSize;
- }
-
-
// ------------------------------------------------ HTTP specific
properties
// ------------------------------------------ passed through to the
EndPoint
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Jan
9 12:22:54 2015
@@ -319,8 +319,7 @@ public class Http11AprProtocol extends A
SocketWrapperBase<Long> socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
- return new UpgradeProcessor<>(socket, leftoverInput,
httpUpgradeProcessor,
- proto.getUpgradeAsyncWriteBufferSize());
+ return new UpgradeProcessor<>(socket, leftoverInput,
httpUpgradeProcessor);
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Fri Jan
9 12:22:54 2015
@@ -240,8 +240,7 @@ public class Http11Nio2Protocol extends
SocketWrapperBase<Nio2Channel> socket, ByteBuffer
leftoverInput,
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
- return new UpgradeProcessor<>(socket, leftoverInput,
- httpUpgradeProcessor,
proto.getUpgradeAsyncWriteBufferSize());
+ return new UpgradeProcessor<>(socket, leftoverInput,
httpUpgradeProcessor);
}
@Override
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Jan
9 12:22:54 2015
@@ -280,8 +280,7 @@ public class Http11NioProtocol extends A
SocketWrapperBase<NioChannel> socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
- return new UpgradeProcessor<>(socket, leftoverInput,
httpUpgradeProcessor,
- proto.getUpgradeAsyncWriteBufferSize());
+ return new UpgradeProcessor<>(socket, leftoverInput,
httpUpgradeProcessor);
}
@Override
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Fri Jan 9 12:22:54 2015
@@ -48,11 +48,10 @@ public class UpgradeProcessor<S> impleme
public UpgradeProcessor(SocketWrapperBase<?> wrapper, ByteBuffer
leftOverInput,
- HttpUpgradeHandler httpUpgradeHandler, int asyncWriteBufferSize) {
+ HttpUpgradeHandler httpUpgradeHandler) {
this.httpUpgradeHandler = httpUpgradeHandler;
this.upgradeServletInputStream = new
UpgradeServletInputStream(wrapper);
- this.upgradeServletOutputStream =
- new UpgradeServletOutputStream(wrapper, asyncWriteBufferSize);
+ this.upgradeServletOutputStream = new
UpgradeServletOutputStream(wrapper);
wrapper.unRead(leftOverInput);
wrapper.setTimeout(INFINITE_TIMEOUT);
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Fri Jan 9 12:22:54 2015
@@ -56,8 +56,7 @@ public class UpgradeServletOutputStream
private volatile ClassLoader applicationLoader = null;
- public UpgradeServletOutputStream(SocketWrapperBase<?> socketWrapper,
- int asyncWriteBufferSize) {
+ public UpgradeServletOutputStream(SocketWrapperBase<?> socketWrapper) {
this.socketWrapper = socketWrapper;
}
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1650512&r1=1650511&r2=1650512&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Fri Jan 9 12:22:54 2015
@@ -525,15 +525,6 @@
this priority means.
</p>
</attribute>
-
- <attribute name="upgradeAsyncWriteBufferSize" required="false">
- <p>The default size of the buffer to allocate to for asynchronous writes
- that can not be completed in a single operation. Data that can't be
- written immediately will be stored in this buffer until it can be
written.
- If more data needs to be stored than space is available in the buffer
than
- the size of the buffer will be increased for the duration of the write.
If
- not specified the default value of 8192 will be used.</p>
- </attribute>
</attributes>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
