From: Jeff King <peff@peff.net>
Date: Sun, 9 Jun 2013 08:08:22 +0000 (-0400)
Subject: t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
X-Git-Tag: v1.8.3.4~27^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8adcc4730339c69d173ea4f10c06d7af4a456b4;p=git

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>
---

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