From 812a99d4afe045b4f9267a127a8da2ea514e2859 Mon Sep 17 00:00:00 2001
From: lacatoire <la.catoire@gmail.com>
Date: Thu, 27 Aug 2026 10:45:01 +0200
Subject: [PATCH 1/2] [fpm] Document PHP 8.5 FPM changes:
 fastcgi.script_path_encoded and access log limit

---
 appendices/migration85/other-changes.xml |  7 ++++---
 install/fpm/configuration.xml            | 26 +++++++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/appendices/migration85/other-changes.xml b/appendices/migration85/other-changes.xml
index 4f5669fee068..c1667be88a73 100644
--- a/appendices/migration85/other-changes.xml
+++ b/appendices/migration85/other-changes.xml
@@ -67,9 +67,10 @@
    <title>FPM</title>
 
    <simpara>
-    FPM with httpd ProxyPass optionally decodes the full script path. Added
-    <!-- <link linkend="ini.fastcgi.script_path_encoded"-->fastcgi.script_path_encoded<!-- </link> -->
-    INI setting to prevent this new behavior.
+    FPM with httpd ProxyPass can optionally decode the full script path as of PHP 8.5.0.
+    The new <link linkend="ini.fastcgi.script-path-encoded">fastcgi.script_path_encoded</link>
+    INI setting controls this behavior; it defaults to <literal>1</literal> to preserve
+    the previous behavior of not decoding the path.
    </simpara>
 
    <simpara>
diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index e2396d9482cd..5411bbef8a59 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -806,10 +806,30 @@
        <type>string</type>
       </term>
       <listitem>
-       <para>
+       <simpara>
         The access log file.
-        Default value: not set
-       </para>
+        Default value: not set.
+       </simpara>
+       <simpara>
+        As of PHP 8.5.0, the access log line length limit respects the
+        global <link linkend="log-limit">log_limit</link> setting.
+       </simpara>
+      </listitem>
+     </varlistentry>
+     <varlistentry xml:id="ini.fastcgi.script-path-encoded">
+      <term>
+       <parameter>fastcgi.script_path_encoded</parameter>
+       <type>bool</type>
+      </term>
+      <listitem>
+       <simpara>
+        When enabled (<literal>1</literal>, the default as of PHP 8.5.0),
+        FPM does not URL-decode the <literal>SCRIPT_FILENAME</literal> sent
+        by httpd <literal>ProxyPass</literal>, preserving the previous behavior.
+        Set to <literal>0</literal> to opt into the new behavior where FPM
+        URL-decodes the full script path.
+        Available as of PHP 8.5.0.
+       </simpara>
       </listitem>
      </varlistentry>
      <varlistentry xml:id="access-format">

From e59fbb2f695996e67a9dc850c321f4b5dc085685 Mon Sep 17 00:00:00 2001
From: lacatoire <la.catoire@gmail.com>
Date: Thu, 1 Oct 2026 08:23:04 +0200
Subject: [PATCH 2/2] Link ProxyPass to the Apache documentation

---
 appendices/migration85/other-changes.xml | 6 ++++--
 install/fpm/configuration.xml            | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/appendices/migration85/other-changes.xml b/appendices/migration85/other-changes.xml
index c1667be88a73..53dc8bcf3767 100644
--- a/appendices/migration85/other-changes.xml
+++ b/appendices/migration85/other-changes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<sect1 xml:id="migration85.other-changes">
+<sect1 xml:id="migration85.other-changes" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Other Changes</title>
 
  <sect2 xml:id="migration85.other-changes.core">
@@ -67,7 +67,9 @@
    <title>FPM</title>
 
    <simpara>
-    FPM with httpd ProxyPass can optionally decode the full script path as of PHP 8.5.0.
+    FPM with httpd
+    <link xlink:href="https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass"><literal>ProxyPass</literal></link>
+    can optionally decode the full script path as of PHP 8.5.0.
     The new <link linkend="ini.fastcgi.script-path-encoded">fastcgi.script_path_encoded</link>
     INI setting controls this behavior; it defaults to <literal>1</literal> to preserve
     the previous behavior of not decoding the path.
diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 5411bbef8a59..151bd99f26c8 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -825,7 +825,9 @@
        <simpara>
         When enabled (<literal>1</literal>, the default as of PHP 8.5.0),
         FPM does not URL-decode the <literal>SCRIPT_FILENAME</literal> sent
-        by httpd <literal>ProxyPass</literal>, preserving the previous behavior.
+        by httpd
+        <link xlink:href="https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass"><literal>ProxyPass</literal></link>,
+        preserving the previous behavior.
         Set to <literal>0</literal> to opt into the new behavior where FPM
         URL-decodes the full script path.
         Available as of PHP 8.5.0.