From fc92ff75e953a6e15d881e4c721112cdbb5372c4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 9 Jun 2022 10:19:29 +0200
Subject: [PATCH] fix conf (mod_php not built / used)

(cherry picked from commit 74e575ddb5d7c89f4d34633ad33027be7011f3eb)
(cherry picked from commit 37182d26c74d8638018996d0c1e78ad404165973)
---
 php.conf    | 6 ++----
 php.modconf | 9 +++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/php.conf b/php.conf
index 8585837..639652b 100644
--- a/php.conf
+++ b/php.conf
@@ -19,15 +19,13 @@ DirectoryIndex index.php
 #
 # Redirect to local php-fpm (no mod_php in default configuration)
 #
-<IfModule !mod_php5.c>
-  <IfModule !mod_php7.c>
+<IfModule !mod_php.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>
 
 #
@@ -36,7 +34,7 @@ DirectoryIndex index.php
 #
 # mod_php options
 #
-<IfModule  mod_php7.c>
+<IfModule  mod_php.c>
     #
     # Cause the PHP interpreter to handle files with a .php extension.
     #
diff --git a/php.modconf b/php.modconf
index 3377f72..e169f4a 100644
--- a/php.modconf
+++ b/php.modconf
@@ -3,10 +3,11 @@
 # easy for developers to write dynamically generated webpages.
 #
 
-# Cannot load both php5 and php7 modules
+# Cannot load both php5, php7 and php modules
 <IfModule !mod_php5.c>
-  <IfModule prefork.c>
-    LoadModule php7_module modules/libphp7.so
+  <IfModule !mod_php7.c>
+    <IfModule prefork.c>
+      LoadModule php_module modules/libphp.so
+    </IfModule>
   </IfModule>
 </IfModule>
-