github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Regression tests: makes configuration compatible with 2.2 and 2.4 (try 2)

Browse Source
This commit is contained in:
Felipe Zimmerle 2013-12-11 05:58:07 -08:00
parent 65d9272fdc
commit ae252ee876
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/regression/server_root/conf/httpd.conf.in
View File

@ -1,10 +1,5 @@
### Base configuration for starting Apache httpd ### Base configuration for starting Apache httpd
<IfModule !mod_authz_core.c>
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
</IfModule>
<IfDefine !CHROOT> <IfDefine !CHROOT>
# File locations # File locations
PidFile @MSC_REGRESSION_LOGS_DIR@/httpd.pid PidFile @MSC_REGRESSION_LOGS_DIR@/httpd.pid
@ -31,19 +26,24 @@ CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp
LogLevel debug LogLevel debug
ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log
<IfVersion >= 2.4>
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
</IfVersion>
<IfDefine !CHROOT> <IfDefine !CHROOT>
DocumentRoot @MSC_REGRESSION_DOCROOT_DIR@ DocumentRoot @MSC_REGRESSION_DOCROOT_DIR@
<Directory "@MSC_REGRESSION_DOCROOT_DIR@"> <Directory "@MSC_REGRESSION_DOCROOT_DIR@">
Options +Indexes +FollowSymLinks Options +Indexes +FollowSymLinks
AllowOverride None AllowOverride None
<IfVersion >= 2.4>
Allow from all Allow from all
<IfModule !mod_authz_core.c>
Satisfy Any Satisfy Any
</IfModule> </IfVersion>
<IfModule mod_authz_core.c> <IfVersion < 2.4>
Require all granted Require all granted
</IfModule> </IfVersion>
</Directory> </Directory>
</IfDefine> </IfDefine>