From 8bdc5735c66f17157cabeadb44309407596881ea Mon Sep 17 00:00:00 2001 From: jfclere Date: Wed, 20 Jul 2011 15:28:05 +0000 Subject: [PATCH] Improve fix for PR50394 Requires native 1.1.21 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1148815 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/InternalAprInputBuffer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java/org/apache/coyote/http11/InternalAprInputBuffer.java b/java/org/apache/coyote/http11/InternalAprInputBuffer.java index 8c665b07b..8c302456a 100644 --- a/java/org/apache/coyote/http11/InternalAprInputBuffer.java +++ b/java/org/apache/coyote/http11/InternalAprInputBuffer.java @@ -587,11 +587,9 @@ public class InternalAprInputBuffer extends AbstractInputBuffer { 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")); } } -- 2.11.0