aboutsummaryrefslogtreecommitdiffstats
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-05-19 09:27:07 -0700
committerJunio C Hamano <gitster@pobox.com>2023-05-19 09:27:07 -0700
commit646ca8955861b9e3d4b1d130b15fd59673c3c76b (patch)
tree76efba07e9b6ccc0b99411f400bb740d1e2db8b1 /t/lib-httpd
parentMerge branch 'bc/clone-empty-repo-via-protocol-v0' (diff)
parentt/lib-httpd: make CGIPassAuth support conditional (diff)
downloadgit-646ca8955861b9e3d4b1d130b15fd59673c3c76b.tar.gz
git-646ca8955861b9e3d4b1d130b15fd59673c3c76b.zip
Merge branch 'jk/http-test-cgipassauth-unavailable-in-older-apache'
We started unconditionally testing with CGIPassAuth directive but it is unavailable in older Apache that ships with CentOS 7 that has about a year of shelf-life still left. The test has conditionally been disabled when running with an ancient Apache. This was a fix for a recent regression caught before the release, so no need to mention it in the release notes. * jk/http-test-cgipassauth-unavailable-in-older-apache: t/lib-httpd: make CGIPassAuth support conditional
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 9e6892970d..a22d138605 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -146,7 +146,9 @@ SetEnv PERL_PATH ${PERL_PATH}
<LocationMatch /custom_auth/>
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
SetEnv GIT_HTTP_EXPORT_ALL
+ <IfDefine USE_CGIPASSAUTH>
CGIPassAuth on
+ </IfDefine>
</LocationMatch>
ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/