From 2f34c49a698f3dab523102f12d39de9bed233b12 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 12 Jan 2022 11:44:04 +0100
Subject: [PATCH] test timeout adjustment

---
 tests/test.sh | 80 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 7 deletions(-)

diff --git a/tests/test.sh b/tests/test.sh
index ef106a01cd..926bb5ec53 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -29,13 +29,79 @@ echo "php_value[upload_max_filesize] = 800M" >> /etc/php-fpm.d/www.conf
 echo "php_value[post_max_size] = 800M" >> /etc/php-fpm.d/www.conf
 echo "php_value[memory_limit] = -1" >> /etc/php-fpm.d/www.conf
 
-# Customize timeouts.
-sed -i 's/SetHandler "proxy:unix:\/run\/php-fpm\/www.sock|fcgi:\/\/localhost"/SetHandler "proxy:unix:\/run\/php-fpm\/www.sock\|fcgi:\/\/localhost" timeout 1200/' /etc/httpd/conf.d/php.conf
-cat<<EO_F >/etc/httpd/conf.d/fcgi.conf
-FcgidIdleTimeout 1200
-FcgidProcessLifeTime 1200
-FcgidConnectTimeout 1200
-FcgidIOTimeout 1200
+# Customize php handling.
+cat <<EO_F >/etc/httpd/conf.d/php.conf
+#
+# The following lines prevent .user.ini files from being viewed by Web clients.
+#
+<Files ".user.ini">
+    <IfModule mod_authz_core.c>
+        Require all denied
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order allow,deny
+        Deny from all
+        Satisfy All
+    </IfModule>
+</Files>
+
+#
+# Allow php to handle Multiviews
+#
+AddType text/html .php
+
+#
+# Add index.php to the list of files that will be served as directory
+# indexes.
+#
+DirectoryIndex index.php
+
+# mod_php options
+<IfModule  mod_php.c>
+    #
+    # Cause the PHP interpreter to handle files with a .php extension.
+    #
+    <FilesMatch \.(php|phar)$>
+        SetHandler application/x-httpd-php
+    </FilesMatch>
+
+    #
+    # Uncomment the following lines to allow PHP to pretty-print .phps
+    # files as PHP source code:
+    #
+    #<FilesMatch \.phps$>
+    #    SetHandler application/x-httpd-php-source
+    #</FilesMatch>
+
+    #
+    # Apache specific PHP configuration options
+    # those can be override in each configured vhost
+    #
+    php_value session.save_handler "files"
+    php_value session.save_path    "/var/lib/php/session"
+    php_value soap.wsdl_cache_dir  "/var/lib/php/wsdlcache"
+
+    #php_value opcache.file_cache   "/var/lib/php/opcache"
+</IfModule>
+
+# Redirect to local php-fpm if mod_php (5 or 7) is not available
+<IfModule !mod_php5.c>
+  <IfModule !mod_php7.c>
+    <IfModule !mod_php.c>
+      # Enable http authorization headers
+      SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+      <Proxy "unix:/run/php-fpm/www.sock|fcgi://localhost">
+        ProxySet timeout=1200
+      </Proxy>
+
+      <FilesMatch \.(php|phar)$>
+        SetHandler "proxy:fcgi://localhost"
+      </FilesMatch>
+
+    </IfModule>
+  </IfModule>
+</IfModule>
+
 EO_F
 
 mkdir -p /run/php-fpm/ 2>/dev/null