From de1a11ea785eeb76717187c87e044ccc93022bd5 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 16 Dec 2023 08:22:15 +0000
Subject: Issue #2463967 by Darren Oh, tunic, andypost, alexpott, quietone,
 mstrelan, longwave: Add PHP settings to .user.ini

---
 .htaccess | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.htaccess')

diff --git a/.htaccess b/.htaccess
index 4031da475cf..b0b55d58649 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,9 +1,9 @@
 #
-# Apache/PHP/Drupal settings:
+# Apache/mod_php/Drupal settings:
 #
 
 # Protect files and directories from prying eyes.
-<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config|yarn\.lock|package\.json)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
+<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config|yarn\.lock|package\.json|\.user\.ini)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
   <IfModule mod_authz_core.c>
     Require all denied
   </IfModule>
@@ -24,8 +24,11 @@ AddEncoding gzip svgz
 
 # Most of the following PHP settings cannot be changed at runtime. See
 # sites/default/default.settings.php and
-# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
-# changed at runtime.
+# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be changed
+# at runtime.
+#
+# PHP only reads settings from this file if it is running as an Apache module.
+# If PHP is running as a CGI script, see .user.ini.
 <IfModule mod_php.c>
   php_value assert.active                   0
 </IfModule>
-- 
cgit v1.2.3