diff options
| author |  Jeff King <peff@peff.net> | 2013-06-09 04:08:22 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-14 10:28:16 -0700 |
| commit | a8adcc4730339c69d173ea4f10c06d7af4a456b4 (patch) | |
| tree | a120fe22671ed94a748b654c01755c16a3fcaeed /t/lib-httpd | |
| parent | t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 (diff) | |
| download | tgif-a8adcc4730339c69d173ea4f10c06d7af4a456b4.tar.xz | |
t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
In apache 2.4, the "Auth*" and "Require" directives have
moved into the authn_core and authz_core modules,
respectively.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd')
| -rw-r--r-- | t/lib-httpd/apache.conf | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 891edd716c..48e8c8f717 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -47,6 +47,15 @@ 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> +</IfVersion> + PassEnv GIT_VALGRIND PassEnv GIT_VALGRIND_OPTIONS |