summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-06-21 18:12:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-21 20:58:06 (GMT)
commit5bdc47eb55aabef3720039181fc360499081a29f (patch)
tree0dc3e55d161a89fd9c8789ff25c4ed7be734d5d2 /t
parent296f0b3ea9b904982780522215a9c71d4a7bd02c (diff)
downloadgit-5bdc47eb55aabef3720039181fc360499081a29f.zip
git-5bdc47eb55aabef3720039181fc360499081a29f.tar.gz
git-5bdc47eb55aabef3720039181fc360499081a29f.tar.bz2
lib-httpd/apache.conf: check version only after mod_version loads
Commit 0442743 introduced an <IfVersion> directive near the top of the apache config file. However, at that point we have not yet checked for and loaded the mod_version module. This means that the directive will behave oddly if mod_version is dynamically loaded, failing to match when it should. We can fix this by moving the whole block below the LoadModule directive for mod_version. Reported-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rw-r--r--t/lib-httpd/apache.conf7
1 files changed, 4 insertions, 3 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 67b6db1..0f6f9ab 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,7 +1,4 @@
ServerName dummy
-<IfVersion < 2.4>
-LockFile accept.lock
-</IfVersion>
PidFile httpd.pid
DocumentRoot www
LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -26,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