Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Anda77 · Dec 19, 2019 · d971716 · d971716
2 parents aedcaac + c5acf96
commit d971716
Show file tree

Hide file tree

Showing 18 changed files with 1,607 additions and 791 deletions.
diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AsyncIOTest.java b/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();
             }

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java b/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
@@ -521,7 +521,15 @@ public boolean onFail(Throwable cause)
 
     public void onClose()
     {
-        onFail(new ClosedChannelException());
+        switch (_state.get().getType())
+        {
+            case IDLE:
+            case FAILED:
+                return;
+
+            default:
+                onFail(new ClosedChannelException());
+        }
     }
 
     boolean isFailed()

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextState.java
@@ -146,7 +146,11 @@ public void start(final Runnable task)
             @Override
             public void run()
             {
-                state().getAsyncContextEvent().getContext().getContextHandler().handle(channel.getRequest(), task);
+                ContextHandler.Context context = state().getAsyncContextEvent().getContext();
+                if (context == null)
+                    task.run();
+                else
+                    context.getContextHandler().handle(channel.getRequest(), task);
             }
         });
     }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java
@@ -221,7 +221,7 @@ protected void forward(ServletRequest request, ServletResponse response, Dispatc
                 _contextHandler.handle(_pathInContext, baseRequest, (HttpServletRequest)request, (HttpServletResponse)response);
 
                 if (!baseRequest.getHttpChannelState().isAsync())
-                    commitResponse(response, baseRequest);
+                    baseRequest.getResponse().softClose();
             }
         }
         finally
@@ -243,57 +243,6 @@ public String toString()
         return String.format("Dispatcher@0x%x{%s,%s}", hashCode(), _named, _uri);
     }
 
-    @SuppressWarnings("Duplicates")
-    private void commitResponse(ServletResponse response, Request baseRequest) throws IOException, ServletException
-    {
-        if (baseRequest.getResponse().isWriting())
-        {
-            try
-            {
-                // Try closing Writer first (based on knowledge in Response obj)
-                response.getWriter().close();
-            }
-            catch (IllegalStateException ex1)
-            {
-                try
-                {
-                    // Try closing OutputStream as alternate route
-                    // This path is possible due to badly behaving Response wrappers
-                    response.getOutputStream().close();
-                }
-                catch (IllegalStateException ex2)
-                {
-                    ServletException servletException = new ServletException("Unable to commit the response", ex2);
-                    servletException.addSuppressed(ex1);
-                    throw servletException;
-                }
-            }
-        }
-        else
-        {
-            try
-            {
-                // Try closing OutputStream first (based on knowledge in Response obj)
-                response.getOutputStream().close();
-            }
-            catch (IllegalStateException ex1)
-            {
-                try
-                {
-                    // Try closing Writer as alternate route
-                    // This path is possible due to badly behaving Response wrappers
-                    response.getWriter().close();
-                }
-                catch (IllegalStateException ex2)
-                {
-                    ServletException servletException = new ServletException("Unable to commit the response", ex2);
-                    servletException.addSuppressed(ex1);
-                    throw servletException;
-                }
-            }
-        }
-    }
-
     private class ForwardAttributes implements Attributes
     {
         final Attributes _attr;

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java b/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();

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -500,7 +500,7 @@ public boolean handle()
                         // TODO that is done.
 
                         // Set a close callback on the HttpOutput to make it an async callback
-                        _response.closeOutput(Callback.from(_state::completed));
+                        _response.completeOutput(Callback.from(_state::completed));
 
                         break;
                     }
@@ -1245,7 +1245,7 @@ public void failed(final Throwable x)
                     @Override
                     public void succeeded()
                     {
-                        _response.getHttpOutput().closed();
+                        _response.getHttpOutput().completed();
                         super.failed(x);
                     }
 

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
@@ -890,6 +890,9 @@ public void sendError(int code, String message)
             if (LOG.isDebugEnabled())
                 LOG.debug("sendError {}", toStringLocked());
 
+            if (_outputState != OutputState.OPEN)
+                throw new IllegalStateException(_outputState.toString());
+
             switch (_state)
             {
                 case HANDLING:
@@ -903,7 +906,7 @@ public void sendError(int code, String message)
                 throw new IllegalStateException("Response is " + _outputState);
 
             response.setStatus(code);
-            response.closedBySendError();
+            response.softClose();
 
             request.setAttribute(ErrorHandler.ERROR_CONTEXT, request.getErrorContext());
             request.setAttribute(ERROR_REQUEST_URI, request.getRequestURI());
@@ -971,7 +974,7 @@ protected void completed()
         }
 
         // release any aggregate buffer from a closing flush
-        _channel.getResponse().getHttpOutput().closed();
+        _channel.getResponse().getHttpOutput().completed();
 
         if (event != null)
         {

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
@@ -430,20 +430,25 @@ public void onCompleted()
         }
         else if (_parser.inContentState() && _generator.isPersistent())
         {
-            // If we are async, then we have problems to complete neatly
-            if (_input.isAsync())
+            // Try to progress without filling.
+            parseRequestBuffer();
+            if (_parser.inContentState())
             {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("{}unconsumed input {}", _parser.isChunking() ? "Possible " : "", this);
-                _channel.abort(new IOException("unconsumed input"));
-            }
-            else
-            {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("{}unconsumed input {}", _parser.isChunking() ? "Possible " : "", this);
-                // Complete reading the request
-                if (!_input.consumeAll())
+                // If we are async, then we have problems to complete neatly
+                if (_input.isAsync())
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("{}unconsumed input while async {}", _parser.isChunking() ? "Possible " : "", this);
                     _channel.abort(new IOException("unconsumed input"));
+                }
+                else
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("{}unconsumed input {}", _parser.isChunking() ? "Possible " : "", this);
+                    // Complete reading the request
+                    if (!_input.consumeAll())
+                        _channel.abort(new IOException("unconsumed input"));
+                }
             }
         }