summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <carlosmn@github.com>2017-05-20 14:18:32 +0200
committerGitHub <noreply@github.com>2017-05-20 14:18:32 +0200
commit9b1260d36cf94c24eaa318dafab18f4179bc145e (patch)
treec8cf8b520b17c1491621b4d70c628d1b826aa532
parente694e4e9545bcbe7841cdacdbbe4a984af094f63 (diff)
parent39e76bb346760ad1183e8253186df3044752341e (diff)
downloadlibgit2-9b1260d36cf94c24eaa318dafab18f4179bc145e.tar.gz
Merge pull request #4097 from implausible/fix/auto-detect-proxy-callbacks
Fix proxy auto detect not utilizing callbacks
-rw-r--r--src/transports/http.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/transports/http.c b/src/transports/http.c
index 949e857b0..cb4a6d0d5 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -575,6 +575,9 @@ static int apply_proxy_config(http_subtransport *t)
if ((error = git_remote__get_http_proxy(t->owner->owner, !!t->connection_data.use_ssl, &url)) < 0)
return error;
+ opts.credentials = t->owner->proxy.credentials;
+ opts.certificate_check = t->owner->proxy.certificate_check;
+ opts.payload = t->owner->proxy.payload;
opts.type = GIT_PROXY_SPECIFIED;
opts.url = url;
error = git_stream_set_proxy(t->io, &opts);