[WIP!] HTTP Close #1832 (#2338)

* Only close if parser closed and output is shutdown

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* a better possible fix

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java

@@ -62,6 +62,8 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
 
     protected final void shutdownInput()
     {
+        if (LOG.isDebugEnabled())
+            LOG.debug("shutdownInput {}",this);
         while(true)
         {
             State s = _state.get();
@@ -114,6 +116,8 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
     @Override
     public final void shutdownOutput()
     {
+        if (LOG.isDebugEnabled())
+            LOG.debug("shutdownOutput {}",this);
         while(true)
         {
             State s = _state.get();
@@ -166,11 +170,15 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
     @Override
     public final void close()
     {
+        if (LOG.isDebugEnabled())
+            LOG.debug("close {}",this);
         close(null);
     }
 
     protected final void close(Throwable failure)
     {
+        if (LOG.isDebugEnabled())
+            LOG.debug("close({}) {}",failure,this);
         while(true)
         {
             State s = _state.get();

jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java

@@ -496,6 +496,8 @@ abstract public class WriteFlusher
     public boolean onFail(Throwable cause)
     {
         // Keep trying to handle the failure until we get to IDLE or FAILED state
+        if (cause!=null)
+            cause.addSuppressed(new Throwable());
         while (true)
         {
             State current = _state.get();

jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java

@@ -243,6 +243,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
                 int filled = fillRequestBuffer();
                 if (filled>0)
                     bytesIn.add(filled);
+                else if (filled==-1 && getEndPoint().isOutputShutdown())
+                    close();
 
                 // Parse the request buffer.
                 boolean handle = parseRequestBuffer();
@@ -252,13 +254,6 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
                 if (getEndPoint().getConnection()!=this)
                     break;
 
-                // Handle closed parser.
-                if (_parser.isClose() || _parser.isClosed())
-                {
-                    close();
-                    break;
-                }
-
                 // Handle channel event
                 if (handle)
                 {

jetty-server/src/test/java/org/eclipse/jetty/server/ConnectionOpenCloseTest.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -42,9 +43,11 @@ import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.toolchain.test.AdvancedRunner;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.annotation.Slow;
+import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -224,11 +227,9 @@ public class ConnectionOpenCloseTest extends AbstractHttpTest
                 "\r\n").getBytes(StandardCharsets.UTF_8));
         output.flush();
 
-        InputStream inputStream = socket.getInputStream();
+        // Read to EOF
-        HttpTester.Response response = HttpTester.parseResponse(inputStream);
+        String response = BufferUtil.toString(ByteBuffer.wrap(IO.readBytes(socket.getInputStream())));
-        Assert.assertEquals(200, response.getStatus());
+        assertThat(response,Matchers.containsString("200 OK"));
-
-        Assert.assertEquals(-1, inputStream.read());
         socket.close();
 
         Assert.assertTrue(openLatch.await(5, TimeUnit.SECONDS));