Author: kkolinko
Date: Fri Aug 26 12:24:56 2011
New Revision: 1162082
URL: http://svn.apache.org/viewvc?rev=1162082&view=rev
Log:
Make the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50394 done
in r1148815 more explicit.
No functional change.
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=1162082&r1=1162081&r2=1162082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Fri
Aug 26 12:24:56 2011
@@ -615,7 +615,10 @@ public class InternalAprInputBuffer exte
} else {
if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP)
{
throw new
SocketTimeoutException(sm.getString("iib.failedread"));
- } else if (nRead != 0) {
+ } else if (nRead == 0) {
+ // APR_STATUS_IS_EOF, since native 1.1.22
+ return false;
+ } else {
throw new IOException(sm.getString("iib.failedread"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
