diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-11 10:21:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-11 10:21:47 -0700 |
| commit | 97492aacffee48dd217164f6af4b9d1db1aa6646 (patch) | |
| tree | 3dc52dd1021a58845040a6f579c58fda522f6d5a /git-curl-compat.h | |
| parent | 4ae0bc75f97bffec786460b5eaace29d2935487b (diff) | |
| parent | 3e8084f1884ffea25b80f76b7a1bd0e5b3200c8a (diff) | |
Merge branch 'ab/http-pinned-public-key-mismatch'
HTTPS error handling updates.
* ab/http-pinned-public-key-mismatch:
http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
Diffstat (limited to 'git-curl-compat.h')
| -rw-r--r-- | git-curl-compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-curl-compat.h b/git-curl-compat.h index a308bdb3b9..56a83b6bbd 100644 --- a/git-curl-compat.h +++ b/git-curl-compat.h @@ -67,10 +67,11 @@ /** * CURLOPT_PINNEDPUBLICKEY was added in 7.39.0, released in November - * 2014. + * 2014. CURLE_SSL_PINNEDPUBKEYNOTMATCH was added in that same version. */ #if LIBCURL_VERSION_NUM >= 0x072c00 #define GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY 1 +#define GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH 1 #endif /** |