]> git.ipfire.org Git - thirdparty/git.git/commit - http.c
http: handle both "h2" and "h2h3" in curl info lines
authorJeff King <peff@peff.net>
Sat, 17 Jun 2023 05:15:59 +0000 (01:15 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jun 2023 16:08:31 +0000 (09:08 -0700)
commitdb30130165bef1ceff04c0163db6676db23ba2fc
treed7b6af581ec2ec9309f0021a131b024db52f3216
parentb637a41ebe0e65b6d64dd65efaf848b4705dcbed
http: handle both "h2" and "h2h3" in curl info lines

When redacting auth tokens in trace output from curl, we look for http/2
headers of the form "h2h3 [header: value]". This comes from b637a41ebe
(http: redact curl h2h3 headers in info, 2022-11-11).

But the "h2h3" prefix changed to just "h2" in curl's fc2f1e547 (http2:
support HTTP/2 to forward proxies, non-tunneling, 2023-04-14). That's in
released version curl 8.1.0; linking against that version means we'll
fail to correctly redact the trace. Our t5559.17 notices and fails.

We can fix this by matching either prefix, which should handle both old
and new versions.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
http.c