From 42e1697846ff1b19dba272b1ddccba1eac6b07f5 Mon Sep 17 00:00:00 2001
From: Iaroslav Sheptykin <yarik.sheptykin@googlemail.com>
Date: Fri, 23 Jan 2026 15:22:33 +0100
Subject: [PATCH 1/4] Document environment variable expansion in configuration

Added documentation on using environment variable expansion for configuration values, including examples.
---
 install/fpm/configuration.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 12ef26f48af9..476c34accee4 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -1004,6 +1004,20 @@
      </varlistentry>
     </variablelist>
     <para>
+     Configuration values can be set using environment variable expansion.
+     Setting default values when the environment variable is unset or null is also supported.
+     For example:
+        <example>
+        <title>Using environment variable expansion</title>
+        <programlisting role="ini">
+<![CDATA[
+listen = /var/run/php-fpm-$POOL_NAME.sock
+user = ${USER_NAME:-www-data}
+group = ${USER_NAME:-www-data}
+]]>
+        </programlisting>
+       </example>
+    </para>
      It's possible to pass additional environment variables and update PHP settings of a certain pool.
      To do this, you need to add the following options to the pool configuration file.
      <example>

From 0cd7fa84161be3e4451efc57b267851fa2f58a0f Mon Sep 17 00:00:00 2001
From: Iaroslav Sheptykin <yarik.sheptykin@googlemail.com>
Date: Mon, 26 Jan 2026 14:47:40 +0100
Subject: [PATCH 2/4] blance para

---
 install/fpm/configuration.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 476c34accee4..50799e067d30 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -1018,6 +1018,7 @@ group = ${USER_NAME:-www-data}
         </programlisting>
        </example>
     </para>
+    <para>
      It's possible to pass additional environment variables and update PHP settings of a certain pool.
      To do this, you need to add the following options to the pool configuration file.
      <example>

From 6ffad6b13ff947af72d92b30b3c7df1a22161166 Mon Sep 17 00:00:00 2001
From: Iaroslav Sheptykin <yarik.sheptykin@googlemail.com>
Date: Tue, 17 Feb 2026 14:12:54 +0100
Subject: [PATCH 3/4] Wrap ENV in brackets

Co-authored-by: Louis-Arnaud <la.catoire@gmail.com>
---
 install/fpm/configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 50799e067d30..767dc6b07f3a 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -1011,7 +1011,7 @@
         <title>Using environment variable expansion</title>
         <programlisting role="ini">
 <![CDATA[
-listen = /var/run/php-fpm-$POOL_NAME.sock
+listen = /var/run/php-fpm-${POOL_NAME}.sock
 user = ${USER_NAME:-www-data}
 group = ${USER_NAME:-www-data}
 ]]>

From c46e2a54bc1670e6e3ad69c74a07c31cba5f22e1 Mon Sep 17 00:00:00 2001
From: Iaroslav Sheptykin <yarik.sheptykin@googlemail.com>
Date: Mon, 8 Jun 2026 15:46:57 +0200
Subject: [PATCH 4/4] Apply suggestion from @lacatoire

Co-authored-by: Louis-Arnaud <la.catoire@gmail.com>
---
 install/fpm/configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 767dc6b07f3a..67d1dd1344d1 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -1005,7 +1005,7 @@
     </variablelist>
     <para>
      Configuration values can be set using environment variable expansion.
-     Setting default values when the environment variable is unset or null is also supported.
+     Setting default values when the environment variable is unset or null is also supported as of PHP 8.3.0.
      For example:
         <example>
         <title>Using environment variable expansion</title>