aboutsummaryrefslogtreecommitdiffstats
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-29 12:47:55 -0800
committerJunio C Hamano <gitster@pobox.com>2019-01-29 12:47:55 -0800
commit99c0bdd09de2b04b7a4464e14fe9b65e2152b3d1 (patch)
treec1f6d44dc2743af383148345b2590860965f380f /t/lib-httpd
parentd94ade7f1f30409adecf8bdbae74d85cfb9705ef (diff)
parente4871cd50c87610469a08b7fa8ef46677d2b8b7b (diff)
downloadgit-99c0bdd09de2b04b7a4464e14fe9b65e2152b3d1.tar.gz
Merge branch 'ms/http-no-more-failonerror'
Debugging help for http transport. * ms/http-no-more-failonerror: test: test GIT_CURL_VERBOSE=1 shows an error remote-curl: unset CURLOPT_FAILONERROR remote-curl: define struct for CURLOPT_WRITEFUNCTION http: enable keep_error for HTTP requests http: support file handles for HTTP_KEEP_ERROR
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 581c010d8f..cc4b87507e 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -115,6 +115,7 @@ Alias /auth/dumb/ www/auth/dumb/
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
SetEnv GIT_HTTP_EXPORT_ALL
</LocationMatch>
+ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
ScriptAlias /error/ error.sh/