summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-06 21:45:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-06 21:45:43 (GMT)
commite250f495b248ec0bbe493e40c98a10414cfa1eef (patch)
tree465ab644705136d3e2ba1434191c4b95be4d836d /t/lib-httpd
parent5f3b21c1119abc7e19c988b399c7726d47bbb0d1 (diff)
parent8cb01e2fd3a50b6d0893dfb066183f16a3c7a355 (diff)
downloadgit-e250f495b248ec0bbe493e40c98a10414cfa1eef.zip
git-e250f495b248ec0bbe493e40c98a10414cfa1eef.tar.gz
git-e250f495b248ec0bbe493e40c98a10414cfa1eef.tar.bz2
Merge branch 'js/http-custom-headers'
HTTP transport clients learned to throw extra HTTP headers at the server, specified via http.extraHeader configuration variable. * js/http-custom-headers: http: support sending custom HTTP headers
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 9317ba0..b8ed96f 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -102,6 +102,14 @@ Alias /auth/dumb/ www/auth/dumb/
SetEnv GIT_HTTP_EXPORT_ALL
Header set Set-Cookie name=value
</LocationMatch>
+<LocationMatch /smart_headers/>
+ <RequireAll>
+ Require expr %{HTTP:x-magic-one} == 'abra'
+ Require expr %{HTTP:x-magic-two} == 'cadabra'
+ </RequireAll>
+ SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+ SetEnv GIT_HTTP_EXPORT_ALL
+</LocationMatch>
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
ScriptAlias /error/ error.sh/