summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2015-06-11 16:54:48 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2015-06-24 17:26:36 +0200
commitf97d5d090cfc03d02eae3d4a955d49832b4c290c (patch)
tree5ba2ea93bb9dcf193ce41b94c54819d25be1197d
parente247649dfa2767c480d430dcf3be336cf56f1fe3 (diff)
downloadlibgit2-f97d5d090cfc03d02eae3d4a955d49832b4c290c.tar.gz
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.
-rw-r--r--src/transports/http.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/transports/http.c b/src/transports/http.c
index be8faca16..39b286c10 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -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;