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:
Carlos Martín Nieto 2015-06-11 16:54:48 +02:00
parent e247649dfa
commit f97d5d090c

View File

@ -547,15 +547,15 @@ static int http_connect(http_subtransport *t)
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) {
error = git_tls_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
} 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);
}
#endif
}
if (error < 0)
return error;