Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index a4473462d10602a7cc57ee792d8e130a8207c38c..fdb19a50f11c8c71c9f7addcceeab8847558cc49 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,5 +1,8 @@
+ServerName dummy
 PidFile httpd.pid
 DocumentRoot www
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+CustomLog access.log common
 ErrorLog error.log
 
 <IfDefine SSL>