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>
Jeff King committed
Jun 21, 2013 at 14:12 UTC
5bdc47eb55aabef3720039181fc360499081a29f
1 file changed
+4
-3
t/lib-httpd/apache.conf
+4
-3
@@ -1,7 +1,4 @@
1
ServerName dummy
2
-<IfVersion < 2.4>
3
-LockFile accept.lock
4
-</IfVersion>
2
PidFile httpd.pid
3
DocumentRoot www
4
LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -26,6 +23,10 @@ ErrorLog error.log
23
LoadModule version_module modules/mod_version.so
24
</IfModule>
25
26
+<IfVersion < 2.4>
27
+LockFile accept.lock
28
+</IfVersion>
29
+
30
<IfVersion < 2.1>
31
<IfModule !mod_auth.c>
32
LoadModule auth_module modules/mod_auth.so