summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-11 13:13:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-20 14:41:14 -0700
commita797b02f3925c4a6324472e2edaf4a58d4ffc097 (patch)
tree8a6d3e658745281b6fb5e8b072c61856c837b156 /t/lib-httpd
parentMerge branch 'maint' (diff)
downloadtgif-a797b02f3925c4a6324472e2edaf4a58d4ffc097.tar.xz
http tests: Darwin is not that special
We have PidFile definition in the file already, and we have added necessary LoadModule for log_config_module recently. This patch will end up giving LockFile to everybody not just limited to Darwin, but why not? Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf7
1 files changed, 1 insertions, 6 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index f460e40416..21aa42f1c6 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,4 +1,5 @@
ServerName dummy
+LockFile accept.lock
PidFile httpd.pid
DocumentRoot www
LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -8,12 +9,6 @@ ErrorLog error.log
LoadModule log_config_module modules/mod_log_config.so
</IfModule>
-<IfDefine Darwin>
- LoadModule log_config_module modules/mod_log_config.so
- LockFile accept.lock
- PidFile httpd.pid
-</IfDefine>
-
<IfDefine SSL>
LoadModule ssl_module modules/mod_ssl.so