Non-blocking should throw an EOFException on EOF as well.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1718690 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 8, 2015 · 91b7859 · 91b7859
1 parent 5f126cb
commit 91b7859
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net;
 
+import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -1267,6 +1268,9 @@ private int fillReadBuffer(boolean block) throws IOException {
                 }
             } else {
                 nRead = channel.read(socketBufferHandler.getReadBuffer());
+                if (nRead == -1) {
+                    throw new EOFException();
+                }
             }
             return nRead;
         }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -137,6 +137,10 @@
         Improve OpenSSL keystore/truststore configuration by using the code
         from the JSSE implementation. (remm, jfclere)
       </fix>
+      <fix>
+        Fix a potential loop when a client drops the connection unexpectedly.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">