threads / patch / 31318

patchDon't use curl_easy_strerror prior to curl-7.12.0

Subject: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

## tl;dr

12 messages between Aug 22, 2012 and Aug 24, 2012. Diffs are folded; open one to read it.

replies: 11people: 2as markdown or json

Joachim Schmitz· Aug 22, 2012, 15:44 UTC · lore
Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
---
 http.c | 2 ++
 1 file changed, 2 insertions(+)
Show changes to http.c +2 −1
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
Junio C Hamano· Aug 22, 2012, 17:18 UTC · re: Joachim Schmitz · lore

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

"Joachim Schmitz" <jojo@schmitz-digital.de> writes:
> Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>

At the very least, please mention that this reverts be22d92 (http: avoid empty error messages for some curl errors, 2011-09-05) on platforms with older versions of libcURL.

Show 27 quoted lines
> ---
>  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
Joachim Schmitz· Aug 22, 2012, 17:28 UTC · re: Junio C Hamano · lore

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

Show 13 quoted lines
> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Wednesday, August 22, 2012 7:19 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:
> 
> > Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
> 
> At the very least, please mention that this reverts be22d92 (http:
> avoid empty error messages for some curl errors, 2011-09-05) on platforms
> with older versions of libcURL.

a) Of course I didn't know that, thanks for telling me. b) How and where to add that? In the Subject of an email, in the body, right at the front? Like this: ----

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(+)
Show changes to http.c +2 −1
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
Junio C Hamano· Aug 22, 2012, 17:41 UTC · re: Joachim Schmitz · lore

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

"Joachim Schmitz" <jojo@schmitz-digital.de> writes:
Show 8 quoted lines
> Like this:
> ----
>
> 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>
> ---
Perfect ;-)
Show 11 quoted lines
>  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;
>                         }

Now we need to see where these whitespace breakages are coming from and fix it, and I think it should be done earlier than later, as I expect we will be seeing more patches from you in the coming weeks.

Show 15 quoted lines
>                 } 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
Joachim Schmitz· Aug 22, 2012, 17:59 UTC · re: Junio C Hamano · lore

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

Show 34 quoted lines
> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Wednesday, August 22, 2012 7:41 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:
> 
> > Like this:
> > ----
> >
> > 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>
> > ---
> 
> Perfect ;-)
> 
> >  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;
> >                         }
> 
> Now we need to see where these whitespace breakages are coming from and
> fix it, and I think it should be done earlier than later, as I expect we
will be
> seeing more patches from you in the coming weeks.

OK, next attempt (this time I downloaded the patch file to my PC first and used Wordpad for copy/past rather than cat in a PuTTY session) ---

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(+)
Show changes to http.c +2 −0
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

Better?

Bye, Jojo
Junio C Hamano· Aug 22, 2012, 18:17 UTC · re: Joachim Schmitz · lore

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

"Joachim Schmitz" <jojo@schmitz-digital.de> writes:
Show 15 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)
Likewrapped X-<
Show 13 quoted lines
>  				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 {
Joachim Schmitz· Aug 22, 2012, 18:50 UTC · re: Junio C Hamano · lore

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

Show 27 quoted lines
> -----Original Message-----
> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Wednesday, August 22, 2012 8:17 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:
> 
> >
> > 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)
> 
> Likewrapped X-<
Any suggestion?
Junio C Hamano· Aug 22, 2012, 21:01 UTC · re: Joachim Schmitz · lore

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

"Joachim Schmitz" <jojo@schmitz-digital.de> writes:
Show 10 quoted lines
>> > 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).

Joachim Schmitz· Aug 22, 2012, 21:05 UTC · re: Junio C Hamano · lore

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

Show 20 quoted lines
> 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 :-(
Bye, Jojo
Joachim Schmitz· Aug 23, 2012, 07:33 UTC · re: Junio C Hamano · lore

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

Show 32 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? ---

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(+)
Show changes to http.c +2 −0
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
Junio C Hamano· Aug 23, 2012, 21:27 UTC · re: Joachim Schmitz · lore

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

"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 {
Joachim Schmitz· Aug 24, 2012, 05:30 UTC · re: Junio C Hamano · lore

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

Show 42 quoted lines
> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Thursday, August 23, 2012 11:27 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:
> 
> >> 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,
OK, those are not allowed then? Or would they need to look different?
Show 5 quoted lines
> 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.
Thanks
> > This reverts be22d92 (http: avoid empty error messages for some curl errors, 2011-09-05) on platforms with older versions of
> > libcURL.

You meant that linewrap between "of" and libcURL?, Or well, that was the 132 position... Or do you want these messages being wrapped at <=80?

Bye, Jojo

← back to recent threads