From 39e76bb346760ad1183e8253186df3044752341e Mon Sep 17 00:00:00 2001
From: tyler wanek <tylerw@axosoft.com>
Date: Fri, 27 Jan 2017 16:05:20 -0700
Subject: [PATCH] Do not discard proxy_options that have been set when auto is
 specified

---
 src/transports/http.c | 3 +++
 1 file changed, 3 insertions(+)

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);