X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=http.c;h=5f348169c3cdcafbfdc561a468996f7118ce3a56;hb=bad5ed39cdd84953f935f4442dd92fe3f7afafc2;hp=82f493c7fd3a81e5e668afa6cfa282b7023d312d;hpb=4d17fd253fbba05c643593bcb86515683badb03f;p=thirdparty%2Fgit.git

diff --git a/http.c b/http.c
index 82f493c7fd..5f348169c3 100644
--- a/http.c
+++ b/http.c
@@ -511,9 +511,11 @@ static void set_proxyauth_name_password(CURL *result)
 #else
 		struct strbuf s = STRBUF_INIT;
 
-		strbuf_addstr_urlencode(&s, proxy_auth.username, 1);
+		strbuf_addstr_urlencode(&s, proxy_auth.username,
+					is_rfc3986_unreserved);
 		strbuf_addch(&s, ':');
-		strbuf_addstr_urlencode(&s, proxy_auth.password, 1);
+		strbuf_addstr_urlencode(&s, proxy_auth.password,
+					is_rfc3986_unreserved);
 		curl_proxyuserpwd = strbuf_detach(&s, NULL);
 		curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
 #endif
@@ -1071,6 +1073,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 
 	git_config(urlmatch_config_entry, &config);
 	free(normalized_url);
+	string_list_clear(&config.vars, 1);
 
 #if LIBCURL_VERSION_NUM >= 0x073800
 	if (http_ssl_backend) {