Re: [PATCH] Try an uppercase version of $prot_proxy env var

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jeff King <peff@xxxxxxxx> writes:

> Don't we explicitly not want to do this when the protocol is http? Curl
> doesn't respect HTTP_PROXY.

Yes.  Here is what I'll queue.

-- >8 --
From: Nelson Benitez Leon <nelsonjesus.benitez@xxxxxxxxxxxxxx>
Date: Thu, 26 Apr 2012 15:16:51 +0200
Subject: [PATCH] http: try an uppercase version of $proto_proxy

Fall back to an uppercase version of $prot_proxy environment variable
when the lowercase version is not found (but do not do that for http).

Signed-off-by: Nelson Benitez Leon <nbenitezl@xxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
 http.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/http.c b/http.c
index ad2dc36..262778b 100644
--- a/http.c
+++ b/http.c
@@ -320,6 +320,12 @@ static CURL *get_curl_handle(const char *url)
 		strbuf_addf(&buf, "%s_proxy", cre_url.protocol);
 		env_proxy_var = strbuf_detach(&buf, NULL);
 		env_proxy = getenv(env_proxy_var);
+		if (!env_proxy && strcmp("http_proxy", env_proxy_var)) {
+			char *p;
+			for (p = env_proxy_var; *p; p++)
+				*p = toupper(*p);
+			env_proxy = getenv(env_proxy_var);
+		}
 		if (env_proxy) {
 			read_http_proxy = 1;
 			no_proxy = getenv("no_proxy");
-- 
1.7.10.475.g8b959

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]