From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 05 Apr 2017 13:52:24 GMT
Subject: Re: [PATCH 6/7] Handle missing CURLINFO_SSL_DATA_{IN,OUT}
Message-ID: <CACBZZX43nYQH3+TX5vvrM-btzQNWsOWi62G6zPXw_BZmZb2dJA@mail.gmail.com>
In-Reply-To: <20170405130424.13803-7-tgc@jupiterrise.com>

On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen <tgc@jupiterrise.com> wrote:
> Do not try and use CURLINFO_SSL_DATA_{IN,OUT} for curl < 7.12.1.

Disables code added by Elia Pinto in 74c682d3c6. Looks harmless to me
since it's just omitting some information when GIT_TRACE_CURL is set.

> Signed-off-by: Tom G. Christensen <tgc@jupiterrise.com>
> ---
>  http.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/http.c b/http.c
> index ce618bdca..a46ab23af 100644
> --- a/http.c
> +++ b/http.c
> @@ -649,10 +649,12 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
>                 text = "=> Send data";
>                 curl_dump_data(text, (unsigned char *)data, size);
>                 break;
> +#if LIBCURL_VERSION_NUM >= 0x070c01
>         case CURLINFO_SSL_DATA_OUT:
>                 text = "=> Send SSL data";
>                 curl_dump_data(text, (unsigned char *)data, size);
>                 break;
> +#endif
>         case CURLINFO_HEADER_IN:
>                 text = "<= Recv header";
>                 curl_dump_header(text, (unsigned char *)data, size, NO_FILTER);
> @@ -661,10 +663,12 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
>                 text = "<= Recv data";
>                 curl_dump_data(text, (unsigned char *)data, size);
>                 break;
> +#if LIBCURL_VERSION_NUM >= 0x070c01
>         case CURLINFO_SSL_DATA_IN:
>                 text = "<= Recv SSL data";
>                 curl_dump_data(text, (unsigned char *)data, size);
>                 break;
> +#endif
>         }
>         return 0;
>  }
> --
> 2.12.2
>