Merge branch '7.2' into 7.3

javiereguiluz · javiereguiluz · commit c983e760a759 · 2025-01-28T09:48:30.000+01:00
* 7.2:
  [Messenger] Describe `--keepalive` option (AmazonSQS &amp; Beanstalkd)
  fix typo
diff --git a/messenger.rst b/messenger.rst
@@ -543,6 +543,19 @@ command with the ``--all`` option:
 
     The ``--all`` option was introduced in Symfony 7.1.
 
+The ``--keepalive`` option can be used to prevent messages from being prematurely
+redelivered during long-running processing. It marks the message as "in progress"
+and prevents it from being redelivered until the worker finishes processing it.
+
+.. note::
+
+    This option is only available for supported transports, which are
+    the Beanstalkd and AmazonSQS transports.
+
+.. versionadded:: 7.2
+
+    The ``--keepalive`` option was introduced in Symfony 7.2.
+
 .. tip::
 
     In a development environment and if you're using the Symfony CLI tool,
@@ -1709,6 +1722,10 @@ The transport has a number of options:
     The message time to run before it is put back in the ready queue - in
     seconds.
 
+.. versionadded:: 7.2
+
+    Keepalive support, using the ``--keepalive`` option, was added in Symfony 7.2.
+
 .. _messenger-redis-transport:
 
 Redis Transport
@@ -2031,6 +2048,10 @@ The transport has a number of options:
     FIFO queues don't support setting a delay per message, a value of ``delay: 0``
     is required in the retry strategy settings.
 
+.. versionadded:: 7.2
+
+    Keepalive support, using the `--keepalive` option, was added in Symfony 7.2.
+
 Serializing Messages
 ~~~~~~~~~~~~~~~~~~~~
 
diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst
@@ -207,7 +207,7 @@ When using Caddy on the server, you can use a configuration like this:
 
         # otherwise, use PHP-FPM (replace "unix//var/..." with "127.0.0.1:9000" when using TCP)
         php_fastcgi unix//var/run/php/php8.3-fpm.sock {
-            # only fallback to root index.php aka front controller.
+            # only fall back to root index.php aka front controller.
             try_files {path} index.php
 
             # optionally set the value of the environment variables used in the application
