Skip to content

Commit 0442743

Browse files
peffgitster
authored andcommitted
t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
The LockFile directive from earlier versions of apache has been replaced by the Mutex directive. The latter seems to give sane defaults and does not need any specific customization, so we can get away with just adding a version check to the use of LockFile. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b3b8ceb commit 0442743

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

t/lib-httpd/apache.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
ServerName dummy
2+
<IfVersion < 2.4>
23
LockFile accept.lock
4+
</IfVersion>
35
PidFile httpd.pid
46
DocumentRoot www
57
LogFormat "%h %l %u %t \"%r\" %>s %b" common

0 commit comments

Comments
 (0)