Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 23, 2012, 21:27 UTC
- Message-ID
- <7vlih52tag.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <000601cd8101$a6f81900$f4e84b00$@schmitz-digital.de>
"Joachim Schmitz" <jojo@schmitz-digital.de> writes:
Show 35 quoted lines
>> From: Joachim Schmitz [mailto:jojo@schmitz-digital.de] >> Sent: Wednesday, August 22, 2012 11:06 PM >> To: 'Junio C Hamano' >> Cc: 'git@vger.kernel.org' >> Subject: RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 >> >> > From: Junio C Hamano [mailto:gitster@pobox.com] >> > Sent: Wednesday, August 22, 2012 11:02 PM >> > To: Joachim Schmitz >> > Cc: git@vger.kernel.org >> > Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 >> > >> > "Joachim Schmitz" <jojo@schmitz-digital.de> writes: >> > >> > >> > diff --git a/http.c b/http.c >> > >> > index b61ac85..18bc6bf 100644 >> > >> > --- a/http.c >> > >> > +++ b/http.c >> > >> > @@ -806,10 +806,12 @@ static int http_request(const char *url, void >> > >> > *result, int target, int options) >> > >> >> > >> Likewrapped X-< >> > > >> > > Any suggestion? >> > >> > Other than "don't wrap" (or "get a real MUA and MTA" X-<), unfortunately no. >> > >> > I do not know if you have checked MUA specific hints section of >> > Documentation/SubmittingPatches; there may be environment specific hints >> > described for a MUA you may have at hand (or not). >> >> I checked, but Outlook isn't mentioned :-( > > OK, Outlook inserts line breaks at position 76. I can't switch it off completely, but can set it to anything between 30 and 132. I > set it to 132 now, does that look OK now?
Yeah, modulo that with all the above noise and with "---" before the log message you inserted by hand before the real commit log message, and also the log message is not properly line-wrapped, it is getting closer to what is expected of a patch to be applied.
I've applied it by hand and fixed the log message up, so no need to resend this particular one. Thanks.
Show 27 quoted lines
> ---
>
> This reverts be22d92 (http: avoid empty error messages for some curl errors, 2011-09-05) on platforms with older versions of
> libcURL.
>
> Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
> ---
> http.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/http.c b/http.c
> index b61ac85..18bc6bf 100644
> --- a/http.c
> +++ b/http.c
> @@ -806,10 +806,12 @@ static int http_request(const char *url, void *result, int target, int options)
> ret = HTTP_REAUTH;
> }
> } else {
> +#if LIBCURL_VERSION_NUM >= 0x070c00
> if (!curl_errorstr[0])
> strlcpy(curl_errorstr,
> curl_easy_strerror(results.curl_result),
> sizeof(curl_errorstr));
> +#endif
> ret = HTTP_ERROR;
> }
> } else {