X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=http.c;h=027a86d75dc4d19e1e7b2361c84fd505c575a0e4;hb=0370b354147de8cb25cf9722bf70a441c0d1fbf4;hp=27aa0a3192988cd0c272dab0e9f6cf52d538b6fa;hpb=2c30e34e1a50f9d14fce8f97f3639ac0ebccd819;p=thirdparty%2Fgit.git

diff --git a/http.c b/http.c
index 27aa0a3192..027a86d75d 100644
--- a/http.c
+++ b/http.c
@@ -513,9 +513,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
@@ -1073,6 +1075,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) {