t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
authorJeff King <peff@peff.net>
Sun, 9 Jun 2013 08:08:22 +0000 (04:08 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 17:28:16 +0000 (10:28 -0700)
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>
t/lib-httpd/apache.conf
index 891edd716cba85cfaf9820fa5265972beb408aeb..48e8c8f717cbbb2ccea1d5b8d3f2b65af819e94f 100644 (file)
@@ -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