Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 896027A5C for ; Wed, 20 Jul 2011 15:28:31 +0000 (UTC) Received: (qmail 94465 invoked by uid 500); 20 Jul 2011 15:28:30 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 94373 invoked by uid 500); 20 Jul 2011 15:28:29 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 94364 invoked by uid 99); 20 Jul 2011 15:28:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 15:28:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 15:28:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6A4F42388897 for ; Wed, 20 Jul 2011 15:28:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148815 - /tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Date: Wed, 20 Jul 2011 15:28:06 -0000 To: dev@tomcat.apache.org From: jfclere@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110720152806.6A4F42388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org