This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 9fec9f1 Fix buffering strategy inconsistency
9fec9f1 is described below
commit 9fec9f1189ab1a8220a17fcdc08c1a869f8ab831
Author: remm <[email protected]>
AuthorDate: Wed Nov 27 18:08:45 2019 +0100
Fix buffering strategy inconsistency
For now: buffer everything, write only when necessary.
---
java/org/apache/tomcat/util/net/SocketWrapperBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 545d333..30d2d47 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -597,7 +597,7 @@ public abstract class SocketWrapperBase<E> {
protected void writeNonBlockingInternal(ByteBuffer from) throws
IOException {
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, socketBufferHandler.getWriteBuffer());
- while (from.hasRemaining() &&
!socketBufferHandler.isWriteBufferWritable()) {
+ while (from.hasRemaining()) {
doWrite(false);
if (socketBufferHandler.isWriteBufferWritable()) {
socketBufferHandler.configureWriteBufferForWrite();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
