Author: remm
Date: Thu Jun 11 17:04:37 2015
New Revision: 1684947
URL: http://svn.apache.org/r1684947
Log:
Read the algorithm, and look at the callers, AJP could be affected as well.
Elsewhere there are checks for -1. It is a bit risky to check only on -1
though, but it should work.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.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=1684947&r1=1684946&r2=1684947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Jun 11
17:04:37 2015
@@ -1532,6 +1532,8 @@ public class AjpProcessor extends Abstra
left = left - read;
start = start + read;
}
+ } else if (read == -1) {
+ throw new EOFException();
}
return read > 0;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1684947&r1=1684946&r2=1684947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Thu Jun
11 17:04:37 2015
@@ -730,7 +730,7 @@ public class Http11InputBuffer implement
if (nRead > 0) {
lastValid = pos + nRead;
return true;
- } else if (nRead < 0) {
+ } else if (nRead == -1) {
throw new EOFException(sm.getString("iib.eof.error"));
} else {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
