Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.

Signed-off-by: Simone Bordet <[email protected]>

Author: sbordet

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

@@ -627,20 +627,7 @@ public void close()
     {
         Runnable task = _httpChannel.onClose();
         if (task != null)
-        {
-            ThreadPool.executeImmediately(getExecutor(), () ->
-            {
-                try
-                {
-                    task.run();
-                }
-                finally
-                {
-                    super.close();
-                }
-            });
-            return;
-        }
+            task.run();
         super.close();
     }
 

jetty-ee10/jetty-ee10-servlets/src/test/resources/jetty-logging.properties

@@ -1,5 +1,5 @@
 # Jetty Logging using jetty-slf4j-impl
 #org.eclipse.jetty.LEVEL=DEBUG
-#org.eclipse.jetty.ee9.servlets.LEVEL=DEBUG
-#org.eclipse.jetty.ee9.servlets.QoSFilter.LEVEL=DEBUG
-#org.eclipse.jetty.ee9.servlets.DoSFilter.LEVEL=DEBUG
+#org.eclipse.jetty.ee10.servlets.LEVEL=DEBUG
+#org.eclipse.jetty.ee10.servlets.QoSFilter.LEVEL=DEBUG
+#org.eclipse.jetty.ee10.servlets.DoSFilter.LEVEL=DEBUG

jetty-ee11/jetty-ee11-servlets/src/test/resources/jetty-logging.properties

@@ -1,5 +1,5 @@
 # Jetty Logging using jetty-slf4j-impl
 #org.eclipse.jetty.LEVEL=DEBUG
-#org.eclipse.jetty.ee9.servlets.LEVEL=DEBUG
-#org.eclipse.jetty.ee9.servlets.QoSFilter.LEVEL=DEBUG
-#org.eclipse.jetty.ee9.servlets.DoSFilter.LEVEL=DEBUG
+#org.eclipse.jetty.ee11.servlets.LEVEL=DEBUG
+#org.eclipse.jetty.ee11.servlets.QoSFilter.LEVEL=DEBUG
+#org.eclipse.jetty.ee11.servlets.DoSFilter.LEVEL=DEBUG