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 7713dd260948c0fca0c0633b6c2cc152f7bc1361..0b81a0047b8d9cd60266500907e95ddc5b87742c 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -69,6 +69,8 @@ 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/