Merge branch 'maint'

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index a0d4077ee36853f654653579f38b29009643d88f..21aa42f1c613538ba26c0b613cc0d1b001bc52b9 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,16 +1,13 @@
 ServerName dummy
+LockFile accept.lock
 PidFile httpd.pid
 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
-
-<IfDefine Darwin>
+<IfModule !mod_log_config.c>
        LoadModule log_config_module modules/mod_log_config.so
-       LockFile accept.lock
-       PidFile httpd.pid
-</IfDefine>
+</IfModule>
 
 <IfDefine SSL>
 LoadModule ssl_module modules/mod_ssl.so