From: "Joachim Schmitz" <jojo@schmitz-digital.de>
To: "'Junio C Hamano'" <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0
Date: Thu, 23 Aug 2012 09:33:55 +0200 [thread overview]
Message-ID: <000601cd8101$a6f81900$f4e84b00$@schmitz-digital.de> (raw)
In-Reply-To:
> 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?
---
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 {
--
1.7.12
Bye, Jojo
next prev parent reply other threads:[~2012-08-23 7:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 15:44 [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 Joachim Schmitz
2012-08-22 17:18 ` Junio C Hamano
2012-08-22 17:28 ` Joachim Schmitz
2012-08-22 17:41 ` Junio C Hamano
2012-08-22 17:59 ` Joachim Schmitz
2012-08-22 18:17 ` Junio C Hamano
2012-08-22 18:50 ` Joachim Schmitz
2012-08-22 21:01 ` Junio C Hamano
2012-08-22 21:05 ` Joachim Schmitz
2012-08-23 7:33 ` Joachim Schmitz [this message]
2012-08-23 21:27 ` Junio C Hamano
2012-08-24 5:30 ` Joachim Schmitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='000601cd8101$a6f81900$f4e84b00$@schmitz-digital.de' \
--to=jojo@schmitz-digital.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).