Re: What's cooking in git.git (Apr 2012, #09; Mon, 23)
- From
- Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
- Date
- Apr 24, 2012, 09:14 UTC
- Message-ID
- <4F966F0C.6090504@seap.minhap.es>
- In-Reply-To
- <xmqq8vhmhzpk.fsf@junio.mtv.corp.google.com>
On 04/24/2012 12:04 AM, Junio C Hamano wrote:
Show 10 quoted lines
> > * nl/http-proxy-more (2012-04-19) 7 commits > - http: fix proxy password passing > - http: fix proxy authentication > - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY > - http: Avoid limit of retrying request only twice > - http: handle proxy authentication failure (error 407) > - http: handle proxy proactive authentication > - http: try http_proxy env var when http.proxy config option is not set >
I'm a bit lost with the state of this, I read your last discussion and you sent patches to support a proxy url without the protocol part, I assume that's done and apart from that there is a bug in the LIBCURL_VERSION which is an easy fix I could send a patch for.
> The code to talk to http proxies learn to use the same credential
> API used to talk to the final http destinations. This still needs
> to peek into $ENV{HTTPS_PROXY}.My original patch already peeked in HTTPS_PROXY env var, I post the
relevant part:
+ if (!curl_http_proxy) {
+ const char *env_proxy, *no_proxy;
+ char *env_proxy_var;
+ int read_http_proxy;
+ struct strbuf buf = STRBUF_INIT;
+ credential_from_url(&cre_url, url);
+ strbuf_addf(&buf, "%s_proxy", cre_url.protocol);
+ env_proxy_var = strbuf_detach(&buf, NULL);
+ env_proxy = getenv(env_proxy_var);^^ HERE ^^
+ if (env_proxy) {
+ read_http_proxy = 1;
+ no_proxy = getenv("no_proxy");
+ if (no_proxy && (!strcmp("*", no_proxy) || strstr(no_proxy, cre_url.host)))
+ read_http_proxy = 0;
+
+ if (read_http_proxy)
+ curl_http_proxy = xstrdup(env_proxy);
+ }
+ free(env_proxy_var);
+ }
if (curl_http_proxy) {so are you referring to something else ?