tests: remove support for apache php module

This was only needed for xmlrpc tests

3 files changed, 2 insertions, 17 deletions

diff --git a/get_apache_modules_dirs.py b/get_apache_modules_dirs.py
index b39c4043..73eca392 100755
--- a/get_apache_modules_dirs.py
+++ b/get_apache_modules_dirs.py
@@ -27,13 +27,6 @@ import sys
 import os
 import glob
 
-def check_php_module(modules_path):
-    php_modules = glob.glob(os.path.join(modules_path, 'libphp7*.so'));
-    if len(php_modules):
-        # The last one in the sorted output will be the desired php module.
-        return sorted(php_modules)[-1];
-
-
 def check_module(modules_path, module):
      module_path = os.path.join(modules_path, module)
      return os.path.isfile(module_path)
@@ -105,7 +98,6 @@ def main():
 
     apache_modules_dir = ''
     apache_ssl_module_dir = ''
-    apache_php_module_file = ''
     apache_mod_unixd_module_file = ''
 
     for lib_dir in ['lib', 'lib64']:
@@ -117,9 +109,6 @@ def main():
                         apache_modules_dir = modules_path
                     if check_module(modules_path, 'mod_ssl.so'):
                         apache_ssl_module_dir = modules_path
-                    php_module = check_php_module(modules_path)
-                    if (php_module):
-                        apache_php_module_file = php_module
                     if check_module(modules_path, 'mod_unixd.so'):
                         apache_mod_unixd_module_file = modules_path
 
@@ -129,7 +118,6 @@ def main():
 
     print(apache_modules_dir + ":" +
           apache_ssl_module_dir + ":" +
-          apache_php_module_file + ":" +
           apache_mod_unixd_module_file, end='')
 
 if __name__ == "__main__":
diff --git a/meson.build b/meson.build
index b1ecbefd..9a135065 100644
--- a/meson.build
+++ b/meson.build
@@ -266,10 +266,8 @@ if have_apache
     cdata.set('APACHE_MODULE_DIR', apache_modules_dirs[0])
     message('Apache SSL module directory: ' + apache_modules_dirs[1])
     cdata.set('APACHE_SSL_MODULE_DIR', apache_modules_dirs[1])
-    message('Apache PHP module file: ' + apache_modules_dirs[2])
-    cdata.set('APACHE_PHP_MODULE_FILE', apache_modules_dirs[2])
-    message('Apache mod_unixd module directory: ' + (apache_modules_dirs[3] != '' ? apache_modules_dirs[3] : '(none)'))
-    cdata.set('IF_HAVE_MOD_UNIXD', apache_modules_dirs[3] != '' ? '' : '#')
+    message('Apache mod_unixd module directory: ' + (apache_modules_dirs[2] != '' ? apache_modules_dirs[2] : '(none)'))
+    cdata.set('IF_HAVE_MOD_UNIXD', apache_modules_dirs[2] != '' ? '' : '#')
     cdata.set('HAVE_APACHE', have_apache)
   else
     message('Failed to locate necessary Apache modules for full test coverage')
diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
index fd666b92..e84c182a 100644
--- a/tests/httpd.conf.in
+++ b/tests/httpd.conf.in
@@ -32,7 +32,6 @@ LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
 
 DirectoryIndex index.txt
 TypesConfig /dev/null
-AddType application/x-httpd-php .php
 Redirect permanent /redirected /index.txt
 
 # Proxy #1: unauthenticated