Skip to content

Commit 6d45d96

Browse files
authored
Merge pull request #1747 from dscho/fix-check-revoke
http: rename http.schannel.checkRevoke to http.schannelCheckRevoke
2 parents 34573d2 + 6152657 commit 6d45d96

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Documentation/config.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,15 +2124,15 @@ http.sslBackend::
21242124
This option is ignored if cURL lacks support for choosing the SSL
21252125
backend at runtime.
21262126

2127-
http.schannel.checkRevoke::
2127+
http.schannelCheckRevoke::
21282128
Used to enforce or disable certificate revocation checks in cURL
21292129
when http.sslBackend is set to "schannel". Defaults to `true` if
21302130
unset. Only necessary to disable this if Git consistently errors
21312131
and the message is about checking the revocation status of a
2132-
certificate. This option is ignored if cURL lacks support for
2132+
certificate. This option is ignored if cURL lacks support for
21332133
setting the relevant SSL option at runtime.
21342134

2135-
http.schannel.useSSLCAInfo::
2135+
http.schannelUseSSLCAInfo::
21362136
As of cURL v7.60.0, the Secure Channel backend can use the
21372137
certificate bundle provided via `http.sslCAInfo`, but that would
21382138
override the Windows Certificate Store. Since this is not desirable

http.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,12 @@ static int http_options(const char *var, const char *value, void *cb)
318318
return 0;
319319
}
320320

321-
if (!strcmp("http.schannel.checkrevoke", var)) {
321+
if (!strcmp("http.schannelcheckrevoke", var)) {
322322
http_schannel_check_revoke = git_config_bool(var, value);
323323
return 0;
324324
}
325325

326-
if (!strcmp("http.schannel.usesslcainfo", var)) {
326+
if (!strcmp("http.schannelusesslcainfo", var)) {
327327
http_schannel_use_ssl_cainfo = git_config_bool(var, value);
328328
return 0;
329329
}
@@ -831,7 +831,7 @@ static CURL *get_curl_handle(void)
831831

832832
if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
833833
!http_schannel_check_revoke) {
834-
#if LIBCURL_VERSION_NUM >= 0x074400
834+
#if LIBCURL_VERSION_NUM >= 0x072c00
835835
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
836836
#else
837837
warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n"

0 commit comments

Comments
 (0)