From 5bdc47eb55aabef3720039181fc360499081a29f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 21 Jun 2013 14:12:51 -0400 Subject: lib-httpd/apache.conf: check version only after mod_version loads Commit 0442743 introduced an 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 Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/lib-httpd/apache.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 't/lib-httpd') diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 67b6db136e..0f6f9abbb1 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -1,7 +1,4 @@ ServerName dummy - -LockFile accept.lock - 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 + +LockFile accept.lock + + LoadModule auth_module modules/mod_auth.so -- cgit v1.2.3