From ffc18c14c70bc1ab37a6f9d8a1b811032eb0d531 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Fri, 26 Aug 2011 12:24:56 +0000 Subject: [PATCH] Make the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50394 done in r1148815 more explicit. No functional change. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1162082 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/InternalAprInputBuffer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/org/apache/coyote/http11/InternalAprInputBuffer.java b/java/org/apache/coyote/http11/InternalAprInputBuffer.java index 8692b0017..294c5b10d 100644 --- a/java/org/apache/coyote/http11/InternalAprInputBuffer.java +++ b/java/org/apache/coyote/http11/InternalAprInputBuffer.java @@ -615,7 +615,10 @@ public class InternalAprInputBuffer extends AbstractInputBuffer { } 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")); } } -- 2.11.0