Author: jfclere
Date: Wed Jul 20 15:28:05 2011
New Revision: 1148815
URL: http://svn.apache.org/viewvc?rev=1148815&view=rev
Log:
Improve fix for PR50394 Requires native 1.1.21
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.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=1148815&r1=1148814&r2=1148815&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Wed
Jul 20 15:28:05 2011
@@ -587,11 +587,9 @@ public class InternalAprInputBuffer exte
bbuf.get(buf, pos, nRead);
lastValid = pos + nRead;
} else {
- if ((-nRead) == Status.APR_EOF)
- return false;
if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP)
{
throw new
SocketTimeoutException(sm.getString("iib.failedread"));
- } else {
+ } else if (nRead != 0) {
throw new IOException(sm.getString("iib.failedread"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
