diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-01 03:38:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-01 03:38:47 +0300 |
| commit | b2893ea403562f94a11edf5c3cc6beb44685d991 (patch) | |
| tree | d87fbee6666ee9f4a0bb710e936ce1b3de80b99e /t/lib-httpd.sh | |
| parent | a0f05f684010332ab3a706979d191b9157643f80 (diff) | |
| parent | 8f2146dbf15566fa60787a3261a048e4d5116d6a (diff) | |
Merge branch 'jk/http-test-fixes'
Various fix-ups on HTTP tests.
* jk/http-test-fixes:
t5559: make SSL/TLS the default
t5559: fix test failures with LIB_HTTPD_SSL
t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2c
t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()
t5551: drop curl trace lines without headers
t5551: handle v2 protocol in cookie test
t5551: simplify expected cookie file
t5551: handle v2 protocol in upload-pack service test
t5551: handle v2 protocol when checking curl trace
t5551: stop forcing clone to run with v0 protocol
t5551: handle HTTP/2 when checking curl trace
t5551: lower-case headers in expected curl trace
t5551: drop redundant grep for Accept-Language
t5541: simplify and move "no empty path components" test
t5541: stop marking "used receive-pack service" test as v0 only
t5541: run "used receive-pack service" test earlier
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 059fd74adb..09cf5ed012 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -290,11 +290,11 @@ expect_askpass() { none) ;; pass) - echo "askpass: Password for 'http://$2@$dest': " + echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': " ;; both) - echo "askpass: Username for 'http://$dest': " - echo "askpass: Password for 'http://$2@$dest': " + echo "askpass: Username for '$HTTPD_PROTO://$dest': " + echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': " ;; *) false |