summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-03-11 11:47:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-11 19:41:56 (GMT)
commit7d59ceed9d1e4f8f0dc52cebf55219d6d395c9da (patch)
tree34d4858ee5f667e59b4cb643d0d6380fe7e81b93
parente47eec8fc6efb5ad0574b4862fd8e8e82b6a62fa (diff)
downloadgit-7d59ceed9d1e4f8f0dc52cebf55219d6d395c9da.zip
git-7d59ceed9d1e4f8f0dc52cebf55219d6d395c9da.tar.gz
git-7d59ceed9d1e4f8f0dc52cebf55219d6d395c9da.tar.bz2
test: do not LoadModule log_config_module unconditionally
LoadModule directive for log_config_module will not work if the module is built-in. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-httpd/apache.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index a0d4077..f460e40 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -4,7 +4,9 @@ DocumentRoot www
LogFormat "%h %l %u %t \"%r\" %>s %b" common
CustomLog access.log common
ErrorLog error.log
-LoadModule log_config_module modules/mod_log_config.so
+<IfModule !mod_log_config.c>
+ LoadModule log_config_module modules/mod_log_config.so
+</IfModule>
<IfDefine Darwin>
LoadModule log_config_module modules/mod_log_config.so