Re: [PATCH v2 2/3] http: try http_proxy env var when http.proxy config option is not set
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 1, 2012, 19:10 UTC
- Message-ID
- <7vy5rkm91t.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <4F4FBE0F.6020004@seap.minhap.es>
Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es> writes:
> CuRL already reads it, but if $http_proxy has username but no password > curl will not ask you for the password.. so we read it ourselves to > detect that and ask for the password.
Please stop the double-dot. Also your capitalization for cURL is screwed up.
More importantly, please describe what happens after "will not ask". "will not ask you for the password and the connection fails"? "will not ask you for the password and the gives an error message saying 'authentication failure'"?
The logic in the patch, needless to say, seems OK, though.
Thanks.
Show 24 quoted lines
>
> 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 8ac8eb6..8932da5 100644
> --- a/http.c
> +++ b/http.c
> @@ -295,6 +295,13 @@ static CURL *get_curl_handle(void)
> if (curl_ftp_no_epsv)
> curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
>
> + if (!curl_http_proxy) {
> + const char *env_proxy;
> + env_proxy = getenv("http_proxy");
> + if (env_proxy) {
> + curl_http_proxy = xstrdup(env_proxy);
> + }
> + }
> if (curl_http_proxy) {
> curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
> curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);