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

test: Makes regression test mac friendly

Browse Source 
Apache configuration was updated and the configure script is using
an alternative way to discovery the libexecdir.
This commit is contained in:
Felipe Zimmerle 2014-01-17 11:24:53 -08:00
parent 8314791c9e
commit 8804b55cdd
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -618,6 +618,7 @@ VERSION_OK
APXS_PROGNAME="`$APXS -q PROGNAME`" APXS_PROGNAME="`$APXS -q PROGNAME`"
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs PROGNAME: $APXS_PROGNAME); fi if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs PROGNAME: $APXS_PROGNAME); fi
APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`" APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`"
if test "xx$APXS_LIBEXECDIR" = "xx"; then APXS_LIBEXECDIR="`$APXS -q LIBDIR`/modules"; fi
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBEXECDIR: $APXS_LIBEXECDIR); fi if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBEXECDIR: $APXS_LIBEXECDIR); fi
APXS_MODULES=$APXS_LIBEXECDIR APXS_MODULES=$APXS_LIBEXECDIR
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs MODULES: $APXS_MODULES); fi if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs MODULES: $APXS_MODULES); fi

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

@ -6,11 +6,20 @@ LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so
# TODO: Need to have these configurable # TODO: Need to have these configurable
LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so
<IfModule !mod_version.c>
LoadModule version_module @APXS_LIBEXECDIR@/mod_version.so
</IfModule>
<IfVersion >= 2.4> <IfVersion >= 2.4>
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so <IfModule !mod_unixd.c>
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so LoadModule unixd_module @APXS_LIBEXECDIR@/mod_unixd.so
LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so </IfModule>
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so <IfModule !mpm_worker_module>
LoadModule mpm_worker_module @APXS_LIBEXECDIR@/mod_mpm_worker.so
</IfModule>
LoadModule access_compat_module @APXS_LIBEXECDIR@/mod_access_compat.so
LoadModule authn_core_module @APXS_LIBEXECDIR@/mod_authn_core.so
LoadModule authz_core_module @APXS_LIBEXECDIR@/mod_authz_core.so
</IfVersion> </IfVersion>
ServerName localhost ServerName localhost