Return-Path: <dev-return-187796-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id D1C32200D62
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sat, 16 Dec 2017 18:19:49 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id CFDA3160C11; Sat, 16 Dec 2017 17:19:49 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 213D2160C01
	for <archive-asf-public@cust-asf.ponee.io>; Sat, 16 Dec 2017 18:19:48 +0100 (CET)
Received: (qmail 65430 invoked by uid 500); 16 Dec 2017 17:19:47 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 65420 invoked by uid 99); 16 Dec 2017 17:19:47 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Dec 2017 17:19:47 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C8C583A00B0
	for <dev@tomcat.apache.org>; Sat, 16 Dec 2017 17:19:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1818438 - in /tomcat/trunk:
 java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Date: Sat, 16 Dec 2017 17:19:44 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20171216171946.C8C583A00B0@svn01-us-west.apache.org>
archived-at: Sat, 16 Dec 2017 17:19:50 -0000

Author: markt
Date: Sat Dec 16 17:19:44 2017
New Revision: 1818438

URL: http://svn.apache.org/viewvc?rev=1818438&view=rev
Log:
Correct handle EOF for ServletInputStream.isReady()

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1818438&r1=1818437&r2=1818438&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sat Dec 16 17:19:44 2017
@@ -2500,9 +2500,9 @@ public class AprEndpoint extends Abstrac
                 return true;
             }
 
-            fillReadBuffer(false);
+            int read = fillReadBuffer(false);
 
-            boolean isReady = socketBufferHandler.getReadBuffer().position() > 0;
+            boolean isReady = socketBufferHandler.getReadBuffer().position() > 0 || read == -1;
             return isReady;
         }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1818438&r1=1818437&r2=1818438&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Dec 16 17:19:44 2017
@@ -67,6 +67,10 @@
       <fix>
         Do not call onDataAvailable without any data to read. (remm)
       </fix>
+      <fix>
+        Correctly handle EOF when <code>ServletInputStream.isReady()</code> is
+        called. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org