diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:43 -0700 |
| commit | e250f495b248ec0bbe493e40c98a10414cfa1eef (patch) | |
| tree | 465ab644705136d3e2ba1434191c4b95be4d836d /t | |
| parent | 5f3b21c1119abc7e19c988b399c7726d47bbb0d1 (diff) | |
| parent | 8cb01e2fd3a50b6d0893dfb066183f16a3c7a355 (diff) | |
| download | git-e250f495b248ec0bbe493e40c98a10414cfa1eef.tar.gz git-e250f495b248ec0bbe493e40c98a10414cfa1eef.tar.xz | |
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')
| -rw-r--r-- | t/lib-httpd/apache.conf | 8 | ||||
| -rwxr-xr-x | t/t5551-http-fetch-smart.sh | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 9317ba085..b8ed96fac 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/ diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index 58207d882..e44fe72c7 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -282,5 +282,12 @@ test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' ' test_line_count = 100000 tags ' +test_expect_success 'custom http headers' ' + test_must_fail git fetch "$HTTPD_URL/smart_headers/repo.git" && + git -c http.extraheader="x-magic-one: abra" \ + -c http.extraheader="x-magic-two: cadabra" \ + fetch "$HTTPD_URL/smart_headers/repo.git" +' + stop_httpd test_done |