Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

2017-09-04 15:56:38 +02:00 · 2017-09-04 15:56:38 +02:00 · daeb84481b
parent eec6453daa 9c03e66670
commit daeb84481b
1 changed files with 1 additions and 1 deletions
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
@ -1168,7 +1168,7 @@ public class SslConnection extends AbstractConnection
        @Override
        public boolean isInputShutdown()
        {
-            return _sslEngine.isInboundDone();
+            return getEndPoint().isInputShutdown() || _sslEngine.isInboundDone();
        }

        private void notifyHandshakeSucceeded(SSLEngine sslEngine)