Merge branch 'maint'

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 4717c2d33b70af6527f8951ec8a414e8caf87095..af6e5e1d6ae503dfadc94feef4d9cb4b623163ec 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,8 +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