Author: markt
Date: Fri Aug 12 07:47:10 2016
New Revision: 1756101
URL: http://svn.apache.org/viewvc?rev=1756101&view=rev
Log:
Align ActionCode.NB_READ_INTEREST
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1756101&r1=1756100&r2=1756101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 12
07:47:10 2016
@@ -546,8 +546,8 @@ public class AjpProcessor extends Abstra
break;
}
case NB_READ_INTEREST: {
- if (!endOfStream) {
- socketWrapper.registerReadInterest();
+ if (!isRequestBodyFullyRead()) {
+ registerReadInterest();
}
break;
}
@@ -1512,6 +1512,11 @@ public class AjpProcessor extends Abstra
}
+ private void registerReadInterest() {
+ socketWrapper.registerReadInterest();
+ }
+
+
/**
* Read at least the specified amount of bytes, and place them
* in the input buffer. Note that if any data is available to read then
this
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756101&r1=1756100&r2=1756101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12
07:47:10 2016
@@ -839,7 +839,9 @@ public class Http11Processor extends Abs
break;
}
case NB_READ_INTEREST: {
- socketWrapper.registerReadInterest();
+ if (!isRequestBodyFullyRead()) {
+ registerReadInterest();
+ }
break;
}
case NB_WRITE_INTEREST: {
@@ -1835,6 +1837,11 @@ public class Http11Processor extends Abs
}
+ private void registerReadInterest() {
+ socketWrapper.registerReadInterest();
+ }
+
+
/**
* Checks to see if the keep-alive loop should be broken, performing any
* processing (e.g. sendfile handling) that may have an impact on whether
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756101&r1=1756100&r2=1756101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12
07:47:10 2016
@@ -293,7 +293,9 @@ public class StreamProcessor extends Abs
break;
}
case NB_READ_INTEREST: {
- stream.getInputBuffer().registerReadInterest();
+ if (!isRequestBodyFullyRead()) {
+ registerReadInterest();
+ }
break;
}
case NB_WRITE_INTEREST: {
@@ -447,6 +449,11 @@ public class StreamProcessor extends Abs
}
+ private void registerReadInterest() {
+ stream.getInputBuffer().registerReadInterest();
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
