Re: [PATCH v5 2/5] http: handle proxy proactive authentication

From: Jeff King <peff@peff.net>
Date: Apr 13, 2012, 20:56 UTC
Message-ID: <20120413205649.GC7919@sigill.intra.peff.net>
In-Reply-To: <4F5F53CA.7090003@seap.minhap.es>

On Tue, Mar 13, 2012 at 03:03:54PM +0100, Nelson Benitez Leon wrote:

> Also take care that CURLOPT_PROXY don't include username or
> password, as we now set them in the new set_proxy_auth() function
> where we use their specific cURL options.

Did you test that this is necessary? We don't do it for the regular URL case, and it makes the code much simpler if we can avoid munging what we hand to curl.

Show 7 quoted lines

> +static void set_proxy_auth(CURL *result)
> +{
> +	if (proxy_auth.username && proxy_auth.password) {
> +#if LIBCURL_VERSION_NUM >= 0x071901
> +		curl_easy_setopt(result, CURLOPT_PROXYUSERNAME, proxy_auth.username);
> +		curl_easy_setopt(result, CURLOPT_PROXYPASSWORD, proxy_auth.password);
> +#else

Is that version check right? You are giving a hexadecimal number, so 7.19.1 would be 071301.

-Peff