Merge branch 'jc/diff-no-index-d-f' into maint-2.3

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index b384d7993545365c17f3c8bded756b4e74faf794..0b81a0047b8d9cd60266500907e95ddc5b87742c 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -68,6 +68,9 @@ LockFile accept.lock
 
 PassEnv GIT_VALGRIND
 PassEnv GIT_VALGRIND_OPTIONS
+PassEnv GNUPGHOME
+PassEnv ASAN_OPTIONS
+PassEnv GIT_TRACE
 
 Alias /dumb/ www/
 Alias /auth/dumb/ www/auth/dumb/