Skip to content

http: set the proxy SSL options, if compiling with a new-enough libcurl #4495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

http: set the proxy SSL options, if compiling with a new-enough libcurl #4495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions git-curl-compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
*/
#if LIBCURL_VERSION_NUM >= 0x073400
#define GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO 1
#define GIT_CURL_HAVE_CURLOPT_PROXY_SSL_OPTIONS 1
#endif

/**
Expand Down
6 changes: 5 additions & 1 deletion http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,8 +1028,12 @@ static CURL *get_curl_handle(void)
#endif
}

if (ssl_options)
if (ssl_options) {
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, ssl_options);
#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_SSL_OPTIONS
curl_easy_setopt(result, CURLOPT_PROXY_SSL_OPTIONS, ssl_options);
#endif
}
}

if (http_proactive_auth)
Expand Down