summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-06-09 08:08:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-14 17:29:01 (GMT)
commitbb3f7ccadb5270e060cfbbb44f9c80a8c65cc449 (patch)
treefce10d021d7c2196cf05f93d26e2e847fbab9280 /t/lib-httpd
parenta8adcc4730339c69d173ea4f10c06d7af4a456b4 (diff)
downloadgit-bb3f7ccadb5270e060cfbbb44f9c80a8c65cc449.zip
git-bb3f7ccadb5270e060cfbbb44f9c80a8c65cc449.tar.gz
git-bb3f7ccadb5270e060cfbbb44f9c80a8c65cc449.tar.bz2
t/lib-httpd/apache.conf: load compat access module in apache 2.4
In apache 2.4, the "Order" directive has gone away in favor of a new system in mod_authz_host. However, since we want our config file to remain compatible across multiple Apache versions, we can use mod_access_compat to keep using the older style. 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.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 48e8c8f..eb44322 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -54,6 +54,9 @@ ErrorLog error.log
<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>
</IfVersion>
PassEnv GIT_VALGRIND