From 112ee65dcc81860ee06912acc571ffcac70fdbaf Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Fri, 24 Aug 2012 17:58:52 +1000
Subject: [PATCH] jetty-9 improved SSL shutdown input

---
 .../src/main/java/org/eclipse/jetty/server/HttpConnection.java | 3 +++
 .../src/main/java/org/eclipse/jetty/server/HttpInput.java      | 1 -
 .../java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java  | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
index 7c70f91545b..c40520910d7 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
@@ -505,7 +505,10 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
                     {
                         // If no more input
                         if (getEndPoint().isInputShutdown())
+                        {
+                            _parser.inputShutdown();
                             return;
+                        }
                         
                         // Wait until we can read
                         FutureCallback<Void> block=new FutureCallback<>();
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
index 33e7be046c5..d5391e4c999 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
@@ -242,7 +242,6 @@ public class HttpInput extends ServletInputStream
                 
                 try
                 {
-                    System.err.println("consume block");
                     blockForContent();
                 }
                 catch(IOException e)
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
index cad3ba70496..e5afb0b8e71 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
@@ -923,9 +923,7 @@ public class SslBytesServerTest extends SslBytesTest
         Assert.assertThat(sslFlushes.get(), Matchers.lessThan(20));
         Assert.assertThat(httpParses.get(), Matchers.lessThan(50));
 
-        System.err.println("--");
         client.close();
-        System.err.println("==");
     }
 
     @Test