diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-09 14:32:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-09 14:32:56 -0800 |
| commit | 4e51984e825a8bc397333bbb946f71f491abf796 (patch) | |
| tree | d408a17992cddc77e12a5ea408c34c68d5e3350b /t | |
| parent | 14c84cd55babd4b9016be825d9d9ffeea17065a2 (diff) | |
| parent | a812952aab1c889528ce941c99e0d8a6db05a754 (diff) | |
| download | git-4e51984e825a8bc397333bbb946f71f491abf796.tar.gz | |
Merge branch 'bw/protocol-v1'
Test fix for a topic already in 'master'.
* bw/protocol-v1:
http: fix v1 protocol tests with apache httpd < 2.4
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-httpd/apache.conf | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index df19436314..724d9ae462 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -25,6 +25,9 @@ ErrorLog error.log <IfModule !mod_headers.c> LoadModule headers_module modules/mod_headers.so </IfModule> +<IfModule !mod_setenvif.c> + LoadModule setenvif_module modules/mod_setenvif.so +</IfModule> <IfVersion < 2.4> LockFile accept.lock @@ -67,9 +70,6 @@ LockFile accept.lock <IfModule !mod_unixd.c> LoadModule unixd_module modules/mod_unixd.so </IfModule> -<IfModule !mod_setenvif.c> - LoadModule setenvif_module modules/mod_setenvif.so -</IfModule> </IfVersion> PassEnv GIT_VALGRIND @@ -79,9 +79,7 @@ PassEnv ASAN_OPTIONS PassEnv GIT_TRACE PassEnv GIT_CONFIG_NOSYSTEM -<IfVersion >= 2.4> - SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0 -</IfVersion> +SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0 Alias /dumb/ www/ Alias /auth/dumb/ www/auth/dumb/ |