Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x

# Conflicts:
#	jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/FormFields.java

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/FormFields.java

@@ -141,6 +141,30 @@ public class FormFields extends ContentSourceCompletableFuture<Fields>
         return from(request, InvocationType.NON_BLOCKING, request, charset, maxFields, maxLength).join();
     }
 
+    /**
+     * Get the Fields from a request. If the Fields have not been set, then attempt to parse them
+     * from the Request content, blocking if necessary.   If the Fields have previously been read asynchronously
+     * by {@link #onFields(Request, Promise.Invocable)} or similar, then those field will return
+     * and this method will not block.
+     * <p>
+     * Calls to {@code onFields} and {@code getFields} methods are idempotent, and
+     * can be called multiple times, with subsequent calls returning the results of the first call.
+     * @param source The {@link Content.Source} from which to read the fields.
+     * @param attributes The {@link Attributes} in which to look for an existing {@link CompletableFuture} of
+     *                   {@link FormFields}, using the classname as the attribute name.  If not found the attribute
+     *                   is set with the created {@link CompletableFuture} of {@link FormFields}.
+     * @param charset the {@link Charset} to use for byte to string conversion.     * @param maxFields The maximum number of fields to accept
+     * @param maxLength The maximum length of fields
+     * @return the Fields
+     * @see #onFields(Request, Promise.Invocable)
+     * @see #onFields(Request, Charset, Promise.Invocable)
+     * @see #getFields(Request)
+     */
+    public static Fields getFields(Content.Source source, Attributes attributes, Charset charset, int maxFields, int maxLength)
+    {
+        return from(source, InvocationType.NON_BLOCKING, attributes, charset, maxFields, maxLength).join();
+    }
+
     /**
      * Asynchronously read and parse FormFields from a {@link Request}.
      * <p>

jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java

@@ -36,6 +36,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java

@@ -36,6 +36,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 

jetty-integrations/jetty-ethereum/src/main/java/org/eclipse/jetty/security/siwe/EthereumAuthenticator.java

@@ -473,7 +473,7 @@ public class EthereumAuthenticator extends LoginAuthenticator implements Dumpabl
             {
                 case FORM_ENCODED ->
                 {
-                    Fields fields = FormFields.from(contentSource, request, getFormEncodedCharset(request), 10, _maxMessageSize).get();
+                    Fields fields = FormFields.getFields(contentSource, request, getFormEncodedCharset(request), 10, _maxMessageSize);
                     signature = fields.get("signature").getValue();
                     message = fields.get("message").getValue();
                 }