Jeff King <peff@xxxxxxxx> writes:
> 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.
>
>> +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.
I notice that I missed this comment, and I think the version queued in
'pu' still has this incorrect.
CURLOPT_PROXYUSERNAME is marked as Introduced at 7.19.1 in
https://github.com/bagder/curl/blob/master/docs/libcurl/symbols-in-versions
so I agree that the above would need to be 0x071301.
--
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