Skip to content

Commit 5bdc47e

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 296f0b3 commit 5bdc47e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

t/lib-httpd/apache.conf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
ServerName dummy
2-
<IfVersion < 2.4>
3-
LockFile accept.lock
4-
</IfVersion>
52
PidFile httpd.pid
63
DocumentRoot www
74
LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -26,6 +23,10 @@ ErrorLog error.log
2623
LoadModule version_module modules/mod_version.so
2724
</IfModule>
2825

26+
<IfVersion < 2.4>
27+
LockFile accept.lock
28+
</IfVersion>
29+
2930
<IfVersion < 2.1>
3031
<IfModule !mod_auth.c>
3132
LoadModule auth_module modules/mod_auth.so

0 commit comments

Comments
 (0)