proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 21:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winhttp: correctly detect HTTPS usage

Browse Source
This commit is contained in:
Carlos Martín Nieto 2015-09-30 17:42:53 +02:00
parent 467e2cb1d7
commit bf6f7ad297
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/transports/winhttp.c
View File

@ -325,6 +325,9 @@ static int userpass_from_url(wchar_t **user, int *user_len,
return 0;
}
#define SCHEME_HTTP "http://"
#define SCHEME_HTTPS "https://"
static int winhttp_stream_connect(winhttp_stream *s)
{
winhttp_subtransport *t = OWNING_SUBTRANSPORT(s);
@ -388,6 +391,15 @@ static int winhttp_stream_connect(winhttp_stream *s)
WINHTTP_PROXY_INFO proxy_info;
wchar_t *proxy_wide;
if (!git__prefixcmp(proxy_url, SCHEME_HTTP)) {
t->proxy_connection_data.use_ssl = false;
} else if (!git__prefixcmp(proxy_url, SCHEME_HTTPS)) {
t->proxy_connection_data.use_ssl = true;
} else {
giterr_set(GITERR_NET, "invalid URL: '%s'", proxy_url);
return -1;
}
if ((error = gitno_extract_url_parts(&t->proxy_connection_data.host, &t->proxy_connection_data.port, NULL,
&t->proxy_connection_data.user, &t->proxy_connection_data.pass, proxy_url, NULL)) < 0)
goto on_error;
@ -398,9 +410,9 @@ static int winhttp_stream_connect(winhttp_stream *s)
}
if (t->proxy_connection_data.use_ssl)
git_buf_puts(&processed_url, "https://");
git_buf_PUTS(&processed_url, SCHEME_HTTPS);
else
git_buf_puts(&processed_url, "http://");
git_buf_PUTS(&processed_url, SCHEME_HTTP);
git_buf_puts(&processed_url, t->proxy_connection_data.host);
if (t->proxy_connection_data.port)