From 831b68430076241ba2ae53bad163197343400e56 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 31 Aug 2018 19:07:57 +0200
Subject: [PATCH] Issue #2871 - Server reads -1 after client resets HTTP/2
 stream.

Backported to jetty-9.3.x branch.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../jetty/http2/client/StreamResetTest.java   | 46 +++++++++++++++++++
 .../org/eclipse/jetty/server/HttpInput.java   | 25 ++++++----
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamResetTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamResetTest.java
index e0f54b01989..ff756ba7881 100644
--- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamResetTest.java
+++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamResetTest.java
@@ -689,4 +689,50 @@ public class StreamResetTest extends AbstractTest
 
         Assert.assertTrue(writeLatch.await(5, TimeUnit.SECONDS));
     }
+
+    @Test
+    public void testResetBeforeBlockingRead() throws Exception
+    {
+        CountDownLatch requestLatch = new CountDownLatch(1);
+        CountDownLatch readLatch = new CountDownLatch(1);
+        CountDownLatch failureLatch = new CountDownLatch(1);
+        start(new HttpServlet()
+        {
+            @Override
+            protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException
+            {
+                try
+                {
+                    requestLatch.countDown();
+                    readLatch.await();
+                    // Attempt to read after reset must throw.
+                    request.getInputStream().read();
+                }
+                catch (InterruptedException x)
+                {
+                    throw new InterruptedIOException();
+                }
+                catch (IOException expected)
+                {
+                    failureLatch.countDown();
+                }
+            }
+        });
+        Session client = newClient(new Session.Listener.Adapter());
+        MetaData.Request request = newRequest("GET", new HttpFields());
+        HeadersFrame frame = new HeadersFrame(request, null, false);
+        FuturePromise<Stream> promise = new FuturePromise<>();
+        client.newStream(frame, promise, new Stream.Listener.Adapter());
+        Stream stream = promise.get(5, TimeUnit.SECONDS);
+        ByteBuffer content = ByteBuffer.wrap(new byte[1024]);
+        stream.data(new DataFrame(stream.getId(), content, true), Callback.NOOP);
+        Assert.assertTrue(requestLatch.await(5, TimeUnit.SECONDS));
+        stream.reset(new ResetFrame(stream.getId(), ErrorCode.CANCEL_STREAM_ERROR.code), Callback.NOOP);
+        // Wait for the reset to arrive to the server and be processed.
+        Thread.sleep(1000);
+        // Try to read on server.
+        readLatch.countDown();
+        // Read on server should fail.
+        Assert.assertTrue(failureLatch.await(5, TimeUnit.SECONDS));
+    }
 }
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 72f589ecff3..dde395812cd 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,20 +242,25 @@ public class HttpInput extends ServletInputStream implements Runnable
             if (LOG.isDebugEnabled())
                 LOG.debug("{} consumed {}", this, content);
 
-            if (content == EOF_CONTENT)
+            if (!isError())
             {
-                if (_listener == null)
-                    _state = EOF;
-                else
+                if (content == EOF_CONTENT)
                 {
-                    _state = AEOF;
-                    boolean woken = _channelState.onReadReady(); // force callback?
-                    if (woken)
-                        wake();
+                    if (_listener == null)
+                        _state = EOF;
+                    else
+                    {
+                        _state = AEOF;
+                        boolean woken = _channelState.onReadReady(); // force callback?
+                        if (woken)
+                            wake();
+                    }
+                }
+                else if (content == EARLY_EOF_CONTENT)
+                {
+                    _state = EARLY_EOF;
                 }
             }
-            else if (content == EARLY_EOF_CONTENT)
-                _state = EARLY_EOF;
 
             content = _inputQ.peek();
         }