mirror of
https://git.proxmox.com/git/libgit2
synced 2025-06-21 10:30:17 +00:00
http: ask for the curl stream for non-encrypted connections
The TLS streams talk over the curl stream themselves, so we don't need to ask for it explicitly. Do so in the case of the non-encrypted one so we can still make use proxies in that case.
This commit is contained in:
parent
e247649dfa
commit
f97d5d090c
@ -547,15 +547,15 @@ static int http_connect(http_subtransport *t)
|
|||||||
t->io = NULL;
|
t->io = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef GIT_CURL
|
|
||||||
error = git_curl_stream_new(&t->io, t->connection_data.host, t->connection_data.port, t->connection_data.use_ssl);
|
|
||||||
#else
|
|
||||||
if (t->connection_data.use_ssl) {
|
if (t->connection_data.use_ssl) {
|
||||||
error = git_tls_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
|
error = git_tls_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
|
||||||
} else {
|
} else {
|
||||||
|
#ifdef GIT_CURL
|
||||||
|
error = git_curl_stream_new(&t->io, t->connection_data.host, t->connection_data.port, false);
|
||||||
|
#else
|
||||||
error = git_socket_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
|
error = git_socket_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
if (error < 0)
|
if (error < 0)
|
||||||
return error;
|
return error;
|
||||||
|
Loading…
Reference in New Issue
Block a user