diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 17:41:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 17:41:01 (GMT) |
| commit | 211e76d48b86f9b3e38c9c9f62d104723dea1964 (patch) | |
| tree | 89178d950ea0af4df69f579b682e36ed46181852 /t | |
| parent | 8589a74b191f1842b633020e28de1c4a1c7f607c (diff) | |
| parent | 5bdc47eb55aabef3720039181fc360499081a29f (diff) | |
| download | git-211e76d48b86f9b3e38c9c9f62d104723dea1964.zip git-211e76d48b86f9b3e38c9c9f62d104723dea1964.tar.gz git-211e76d48b86f9b3e38c9c9f62d104723dea1964.tar.bz2 | |
Merge branch 'jk/apache-test-for-2.4' into maint
Allow our tests to run with newer Apache.
* jk/apache-test-for-2.4:
lib-httpd/apache.conf: check version only after mod_version loads
t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
t/lib-httpd/apache.conf: load compat access module in apache 2.4
t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-httpd/apache.conf | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index b5bce45..dd17e3a 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -1,5 +1,4 @@ ServerName dummy -LockFile accept.lock PidFile httpd.pid DocumentRoot www LogFormat "%h %l %u %t \"%r\" %>s %b" common @@ -24,6 +23,10 @@ ErrorLog error.log LoadModule version_module modules/mod_version.so </IfModule> +<IfVersion < 2.4> +LockFile accept.lock +</IfVersion> + <IfVersion < 2.1> <IfModule !mod_auth.c> LoadModule auth_module modules/mod_auth.so @@ -45,6 +48,21 @@ ErrorLog error.log </IfModule> </IfVersion> +<IfVersion >= 2.4> +<IfModule !mod_authn_core.c> + LoadModule authn_core_module modules/mod_authn_core.so +</IfModule> +<IfModule !mod_authz_core.c> + LoadModule authz_core_module modules/mod_authz_core.so +</IfModule> +<IfModule !mod_access_compat.c> + LoadModule access_compat_module modules/mod_access_compat.so +</IfModule> +<IfModule !mod_mpm_prefork.c> + LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +</IfModule> +</IfVersion> + PassEnv GIT_VALGRIND PassEnv GIT_VALGRIND_OPTIONS |