Skip to content

Commit 6fc4cac

Browse files
author
Felipe Zimmerle
committed
regression-tests: makes configuration compatible with 2.2 and 2.4
1 parent e9813cd commit 6fc4cac

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

tests/regression/server_root/conf/httpd.conf.in

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
### Base configuration for starting Apache httpd
22

3-
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
4-
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
3+
<IfModule !mod_authz_core.c>
4+
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
5+
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
6+
</IfModule>
57

68
<IfDefine !CHROOT>
79
# File locations
@@ -35,6 +37,13 @@ ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log
3537
Options +Indexes +FollowSymLinks
3638
AllowOverride None
3739
Allow from all
38-
Satisfy Any
40+
41+
<IfModule !mod_authz_core.c>
42+
Satisfy Any
43+
</IfModule>
44+
45+
<IfModule mod_authz_core.c>
46+
Require all granted
47+
</IfModule>
3948
</Directory>
4049
</IfDefine>

0 commit comments

Comments
 (0)