summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-20 10:30:17 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-20 10:30:17 -0800
commita9bb4e55a3a552a705f8a6222e4523ed27bb7cc8 (patch)
tree3988956212f4ec2ab4ba1c31a6570f282247f145 /t/lib-httpd
parent80dfab86cd36a25cc5ea8124a1b3946e94d200b5 (diff)
parent2e736fd5e94c6fa44ba95d81a5b0ae407b968b78 (diff)
downloadgit-a9bb4e55a3a552a705f8a6222e4523ed27bb7cc8.tar.gz
Merge branch 'jk/maint-http-half-auth-fetch'
Fixes fetch from servers that ask for auth only during the actual packing phase. This is not really a recommended configuration, but it cleans up the code at the same time. * jk/maint-http-half-auth-fetch: remote-curl: retry failed requests for auth even with gzip remote-curl: hoist gzip buffer size to top of post_rpc
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 49d5d877ce..fe76e84b74 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -99,6 +99,13 @@ SSLEngine On
Require valid-user
</LocationMatch>
+<LocationMatch "^/auth-fetch/.*/git-upload-pack$">
+ AuthType Basic
+ AuthName "git-auth"
+ AuthUserFile passwd
+ Require valid-user
+</LocationMatch>
+
<IfDefine DAV>
LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so