Merge branch 'al/ansi-color'

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index a4473462d10602a7cc57ee792d8e130a8207c38c..af6e5e1d6ae503dfadc94feef4d9cb4b623163ec 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,7 +1,16 @@
+ServerName dummy
 PidFile httpd.pid
 DocumentRoot www
+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