Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

[Ramsay Jones <ramsay@ramsayjones.plus.com>]

On 01/04/16 11:44, Elia Pinto wrote:
> Implements the GIT_CURL_DEBUG environment variable to allow a greater
> degree of detail of GIT_CURL_VERBOSE, in particular the complete
> transport header and all the data payload exchanged.
> It might be useful if a particular situation could require a more
> thorough debugging analysis.
> 
> Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
> ---
>  imap-send.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 97 insertions(+), 2 deletions(-)
> 
> diff --git a/imap-send.c b/imap-send.c
> index 4d3b773..cf79e7f 100644
> --- a/imap-send.c
> +++ b/imap-send.c
[snip]

> @@ -1442,8 +1532,13 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
>  
>  	curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
>  
> -	if (0 < verbosity || getenv("GIT_CURL_VERBOSE"))
> -		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
> +	if (0 < verbosity )

previously it was sufficient to set GIT_CURL_VERBOSE, now I have to
set verbosity too?

[Does it matter that you change "1L" to "1" in the curl_easy_setopt()
call? In http.c (line 567) it also uses "1", but ...]

> +		if (getenv("GIT_CURL_DEBUG")) {
> +			curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
> +			curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, curl_trace);
> +		} else if (getenv("GIT_CURL_VERBOSE"))
> +			curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
> +
>  
>  	return curl;
>  }
> 

I would have expected something like:

if (0 < verbosity || getenv("GIT_CURL_VERBOSE")) {
	curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
	if (getenv("GIT_CURL_DEBUG"))
		curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, curl_trace);
}

Hope That Helps.

ATB,
Ramsay Jones