Author: markt
Date: Thu Jan 15 09:21:52 2015
New Revision: 1652009
URL: http://svn.apache.org/r1652009
Log:
Align HTTP InputBuffer implementations
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1652009&r1=1652008&r2=1652009&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Thu
Jan 15 09:21:52 2015
@@ -78,7 +78,8 @@ public class InternalAprInputBuffer exte
wrapper = socketWrapper;
- int bufLength = Math.max(headerBufferSize * 2, 8192);
+ int bufLength = headerBufferSize +
+ wrapper.getSocketBufferHandler().getReadBuffer().capacity();
if (buf == null || buf.length < bufLength) {
buf = new byte[bufLength];
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java?rev=1652009&r1=1652008&r2=1652009&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Thu
Jan 15 09:21:52 2015
@@ -78,7 +78,7 @@ public class InternalNio2InputBuffer ext
wrapper = socketWrapper;
int bufLength = headerBufferSize +
- wrapper.getSocket().getBufHandler().getReadBuffer().capacity();
+ wrapper.getSocketBufferHandler().getReadBuffer().capacity();
if (buf == null || buf.length < bufLength) {
buf = new byte[bufLength];
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1652009&r1=1652008&r2=1652009&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu
Jan 15 09:21:52 2015
@@ -79,7 +79,7 @@ public class InternalNioInputBuffer exte
wrapper = socketWrapper;
int bufLength = headerBufferSize +
- wrapper.getSocket().getBufHandler().getReadBuffer().capacity();
+ wrapper.getSocketBufferHandler().getReadBuffer().capacity();
if (buf == null || buf.length < bufLength) {
buf = new byte[bufLength];
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1652009&r1=1652008&r2=1652009&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu Jan
15 09:21:52 2015
@@ -179,7 +179,7 @@ public abstract class SocketWrapperBase<
return blockingStatusWriteLock;
}
public Object getWriteThreadLock() { return writeThreadLock; }
-
+ public SocketBufferHandler getSocketBufferHandler() { return
socketBufferHandler; }
public abstract boolean isReadPending();
public boolean hasDataToWrite() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
