summaryrefslogtreecommitdiff
path: root/t/lib-httpd/apache.conf
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-25 08:28:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-25 21:58:57 (GMT)
commit69707d616fd3acda6ecc47198edeaaa87f2cfcea (patch)
treeb075ca30ad3c876c7684dd6a1271d8ecf3fad54d /t/lib-httpd/apache.conf
parent3dbe1165e9facec3497b3da744b832788a47957e (diff)
downloadgit-69707d616fd3acda6ecc47198edeaaa87f2cfcea.zip
git-69707d616fd3acda6ecc47198edeaaa87f2cfcea.tar.gz
git-69707d616fd3acda6ecc47198edeaaa87f2cfcea.tar.bz2
Allow HTTP tests to run on Darwin
This patch allows the HTTP tests to run on OS X 10.5. It is not sufficient to be able to pass in LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH alone, as the apache.conf also needs a couple tweaks. These changes are put into an <IfDefine> to keep them Darwin specific, but this means lib-httpd.sh needs to be modified to pass -DDarwin to apache when running on Darwin. As long as we're making this change to lib-httpd.sh, we may as well set LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH to appropriate default values for the platform. Note that we now pass HTTPD_PARA to apache at shutdown as well. Otherwise apache will emit a harmless, but noisy warning that LogFormat is an unknown directive. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd/apache.conf')
-rw-r--r--t/lib-httpd/apache.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index fdb19a5..af6e5e1 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -5,6 +5,12 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
CustomLog access.log common
ErrorLog error.log
+<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