Author: kkolinko
Date: Fri Aug 26 12:27:52 2011
New Revision: 1162087
URL: http://svn.apache.org/viewvc?rev=1162087&view=rev
Log:
Backport r1162082
Make the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50394 done
in r1148815 more explicit.
No functional change.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 26 12:27:52 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1162087&r1=1162086&r2=1162087&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Fri Aug 26 12:27:52 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]
