Re: [PATCH] Try an uppercase version of $prot_proxy env var
- From
- Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
- Date
- Apr 26, 2012, 16:29 UTC
- Message-ID
- <4F9977FB.8010601@seap.minhap.es>
- In-Reply-To
- <xmqqehraa5ct.fsf@junio.mtv.corp.google.com>
On 04/26/2012 05:18 PM, Junio C Hamano wrote:
Show 6 quoted lines
> Jeff King <peff@peff.net> 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.
Fine. You beat me on time, anyway I send you my version just for the sake of having done it.
>From 66c5e59f486088d12b48a2e624a98242e7ebce46 Mon Sep 17 00:00:00 2001
From: Nelson Benitez Leon <nbenitezl@gmail.com> Date: Thu, 26 Apr 2012 14:44:03 +0200 Subject: [PATCH] http: try an uppercase version of $prot_proxy env var
If the lowercase version of $prot_proxy is not found then try the uppercase one, excluding HTTP_PROXY case as it is ignored by cURL.
Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail.com> --- http.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/http.c b/http.c index 6a98195..0ca5bba 100644 --- a/http.c +++ b/http.c @@ -329,6 +329,13 @@ 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", cre_url.protocol)) { /* skip HTTP_PROXY as cURL ignores it */ + 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.7.6