summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-30 19:09:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-30 19:09:53 (GMT)
commit177f0a400955f2345c73a5c8b0459d617429ffd9 (patch)
treebefe6d8d3e767c1dc6bc06b3a8557d44a5faaefe /t/lib-httpd
parent0d6cf2471f426dd2b742e2285aad78381738be96 (diff)
parent70900eda4a0ed473ab5a933940285ac3dda698c0 (diff)
downloadgit-177f0a400955f2345c73a5c8b0459d617429ffd9.zip
git-177f0a400955f2345c73a5c8b0459d617429ffd9.tar.gz
git-177f0a400955f2345c73a5c8b0459d617429ffd9.tar.bz2
Merge branch 'jk/http-auth-redirects'
Handle the case where http transport gets redirected during the authorization request better. * jk/http-auth-redirects: http.c: Spell the null pointer as NULL remote-curl: rewrite base url from info/refs redirects remote-curl: store url as a strbuf remote-curl: make refs_url a strbuf http: update base URLs when we see redirects http: provide effective url to callers http: hoist credential request out of handle_curl_result http: refactor options to http_get_* http_request: factor out curlinfo_strbuf http_get_file: style fixes
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 397c480..3a03e82 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -110,6 +110,8 @@ ScriptAlias /broken_smart/ broken-smart-http.sh/
RewriteEngine on
RewriteRule ^/smart-redir-perm/(.*)$ /smart/$1 [R=301]
RewriteRule ^/smart-redir-temp/(.*)$ /smart/$1 [R=302]
+RewriteRule ^/smart-redir-auth/(.*)$ /auth/smart/$1 [R=301]
+RewriteRule ^/smart-redir-limited/(.*)/info/refs$ /smart/$1/info/refs [R=301]
<IfDefine SSL>
LoadModule ssl_module modules/mod_ssl.so