Sync with 1.6.2.2

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index f460e404169bba1c57a48a3aac1df2f2b97d0b99..21aa42f1c613538ba26c0b613cc0d1b001bc52b9 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,4 +1,5 @@
 ServerName dummy
+LockFile accept.lock
 PidFile httpd.pid
 DocumentRoot www
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -8,12 +9,6 @@ ErrorLog error.log
        LoadModule log_config_module modules/mod_log_config.so
 </IfModule>
 
-<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