Fix #10229 EE10 Idle Timeout

EE9 idle timeout

jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannel.java

@@ -924,6 +924,7 @@ public String toString()
     public void onRequest(ContextHandler.CoreContextRequest coreRequest)
     {
         _coreRequest = coreRequest;
+        _coreRequest.addIdleTimeoutListener(_state::onIdleTimeout);
         _requests.incrementAndGet();
         _request.onRequest(coreRequest);
         _expects100Continue = coreRequest.getHeaders().contains(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString());

jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java

@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import jakarta.servlet.AsyncListener;
 import jakarta.servlet.ServletContext;
@@ -164,6 +165,14 @@ public State getState()
         }
     }
 
+    public boolean onIdleTimeout(TimeoutException timeout)
+    {
+        try (AutoLock l = lock())
+        {
+            return _state == State.IDLE;
+        }
+    }
+
     public void addListener(AsyncListener listener)
     {
         try (AutoLock l = lock())

jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletTest.java

@@ -0,0 +1,149 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.ee9.servlet;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.LocalConnector;
+import org.eclipse.jetty.server.Server;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+public class ServletTest
+{
+    private Server _server;
+    ServletContextHandler _context;
+    ServletHandler _handler;
+    private LocalConnector _connector;
+
+    @BeforeEach
+    public void beforeEach()
+    {
+        _server = new Server();
+        _connector = new LocalConnector(_server);
+        _server.addConnector(_connector);
+
+        _context = new ServletContextHandler();
+        _context.setContextPath("/ctx");
+
+        _server.setHandler(_context);
+        _handler = _context.getServletHandler();
+    }
+
+    @AfterEach
+    public void afterEach() throws Exception
+    {
+        _server.stop();
+    }
+
+    @Test
+    public void testGET() throws Exception
+    {
+        _context.addServlet(new ServletHolder(new HttpServlet()
+        {
+            @Override
+            protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
+            {
+                resp.getWriter().println("Hello!");
+            }
+        }), "/get");
+
+        _server.start();
+
+        String response = _connector.getResponse("""
+            GET /ctx/get HTTP/1.0
+            
+            """);
+        assertThat(response, containsString(" 200 OK"));
+        assertThat(response, containsString("Hello!"));
+    }
+
+    @Test
+    public void testSimpleIdleIgnored() throws Exception
+    {
+        _context.addServlet(new ServletHolder(new HttpServlet()
+        {
+            @Override
+            protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
+            {
+                try
+                {
+                    Thread.sleep(1000);
+                }
+                catch (InterruptedException e)
+                {
+                    Thread.currentThread().interrupt();
+                }
+                resp.getWriter().println("Hello!");
+            }
+        }), "/get");
+
+        _connector.setIdleTimeout(250);
+        _server.start();
+
+        String response = _connector.getResponse("""
+            GET /ctx/get HTTP/1.0
+            
+            """, 5, TimeUnit.SECONDS);
+        assertThat(response, containsString(" 200 OK"));
+        assertThat(response, containsString("Hello!"));
+    }
+
+    @Test
+    public void testIdle() throws Exception
+    {
+        _context.addServlet(new ServletHolder(new HttpServlet()
+        {
+            @Override
+            protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+            {
+                resp.getWriter().println("Hello!");
+            }
+        }), "/get");
+
+        _connector.setIdleTimeout(250);
+        _server.start();
+
+        try (LocalConnector.LocalEndPoint endPoint = _connector.connect())
+        {
+            String request = """
+                GET /ctx/get HTTP/1.1
+                Host: local
+                            
+                """;
+            endPoint.addInput(request);
+            String response = endPoint.getResponse();
+            assertThat(response, containsString(" 200 OK"));
+            assertThat(response, containsString("Hello!"));
+            endPoint.addInput(request);
+            response = endPoint.getResponse();
+            assertThat(response, containsString(" 200 OK"));
+            assertThat(response, containsString("Hello!"));
+
+            Thread.sleep(500);
+
+            assertFalse(endPoint.isOpen());
+        }
+    }
+}