mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow HTTP tests to run on Darwin

Browse Source 
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>
This commit is contained in:
Jay Soffian
2009-02-25 03:28:15 -05:00
committed by Junio C Hamano
parent 3dbe1165e9
commit 69707d616f
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/lib-httpd/apache.conf
View File

@ -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