Jetty 9.4.x 4331 async close complete - take 2

jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AsyncIOTest.java

@@ -41,7 +41,6 @@
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.frames.DataFrame;
 import org.eclipse.jetty.http2.frames.HeadersFrame;
-import org.eclipse.jetty.http2.frames.ResetFrame;
 import org.eclipse.jetty.http2.frames.SettingsFrame;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.util.Callback;
@@ -243,8 +242,8 @@ public void onWritePossible() throws IOException
                         // The write is too large and will stall.
                         output.write(ByteBuffer.wrap(new byte[2 * clientWindow]));
 
-                        // We cannot call complete() now before checking for isReady().
-                        // This will abort the response and the client will receive a reset.
+                        // We can now call complete() now before checking for isReady().
+                        // This will asynchronously complete when the write is finished.
                         asyncContext.complete();
                     }
 
@@ -275,7 +274,7 @@ public Map<Integer, Integer> onPreface(Session session)
         session.newStream(frame, promise, new Stream.Listener.Adapter()
         {
             @Override
-            public void onReset(Stream stream, ResetFrame frame)
+            public void onClosed(Stream stream)
             {
                 latch.countDown();
             }

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

@@ -47,16 +47,11 @@ public EncodingHttpWriter(HttpOutput out, String encoding)
     public void write(char[] s, int offset, int length) throws IOException
     {
         HttpOutput out = _out;
-        if (length == 0 && out.isAllContentWritten())
-        {
-            out.close();
-            return;
-        }
 
         while (length > 0)
         {
             _bytes.reset();
-            int chars = length > MAX_OUTPUT_CHARS ? MAX_OUTPUT_CHARS : length;
+            int chars = Math.min(length, MAX_OUTPUT_CHARS);
 
             _converter.write(s, offset, chars);
             _converter.flush();