From 45b145421bd286e0344db3f8f00bf10f6f51ca0c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 17 Nov 2017 08:26:13 +0100
Subject: [PATCH] improve comment about mod_php being deprecated

---
 php.conf | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/php.conf b/php.conf
index 2eb6a28..8585837 100644
--- a/php.conf
+++ b/php.conf
@@ -16,7 +16,26 @@ AddType text/html .php
 #
 DirectoryIndex index.php
 
+#
+# Redirect to local php-fpm (no mod_php in default configuration)
+#
+<IfModule !mod_php5.c>
+  <IfModule !mod_php7.c>
+    # Enable http authorization headers
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+
+    <FilesMatch \.(php|phar)$>
+        SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
+    </FilesMatch>
+  </IfModule>
+</IfModule>
+
+#
+# mod_php is deprecated as FPM is now used by default with httpd in event mode
+# mod_php is only used when explicitly enabled or httpd switch to prefork mode
+#
 # mod_php options
+#
 <IfModule  mod_php7.c>
     #
     # Cause the PHP interpreter to handle files with a .php extension.
@@ -43,15 +62,3 @@ DirectoryIndex index.php
 
     #php_value opcache.file_cache   "/var/lib/php/opcache"
 </IfModule>
-
-# Redirect to local php-fpm if mod_php is not available
-<IfModule !mod_php5.c>
-  <IfModule !mod_php7.c>
-    # Enable http authorization headers
-    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
-
-    <FilesMatch \.(php|phar)$>
-        SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
-    </FilesMatch>
-  </IfModule>
-</IfModule>