Patch for http-fetch.c and older curl releases

> Older curl releases do not define CURLE_HTTP_RETURNED_ERROR, they
> use CURLE_HTTP_NOT_FOUND instead. The trivial patch below fixes
> the build error. Newer curl releases keep the CURLE_HTTP_NOT_FOUND
> definition but using a -DCURL_NO_OLDIES preprocessor flag
> the old name will not be present in the 'curl.h' header. The
> comments in 'curl.h' have more info about the name change.
>
> Signed-off-by:  Art Haas <ahaas@airmail.net>

> "Art Haas" <ahaas@airmail.net> writes:
> 
> > Older curl releases do not define CURLE_HTTP_RETURNED_ERROR, they
> > use CURLE_HTTP_NOT_FOUND instead. The trivial patch below fixes
> > the build error. Newer curl releases keep the CURLE_HTTP_NOT_FOUND
> > definition but using a -DCURL_NO_OLDIES preprocessor flag
> > the old name will not be present in the 'curl.h' header. The
> > comments in 'curl.h' have more info about the name change.
> >
> > Signed-off-by:  Art Haas <ahaas@airmail.net>
> 
> The patch to use older name in a recent program feels going
> backwards.  The header is only trying to be nice so you can
> compile old programs written for older interface that use older
> names. If the new way is the primary way with the new interface,
> and if we are writing a new program, I think we should write for
> the new interface.
> 
> Can we have the main code to target the more recent version,
> while working around problems with older versions with backward
> compatibility macros?
> 
> In other words, if the macro HTTP_RETURNED_ERROR is not defined
> in the header (i.e. older version), you define it to be the same
> as HTTP_NOT_FOUND.

> Here's a patch that does that. I patched 'http.h' as there is already
> a number of other curl tests in that file. On the machine where the 
> build was failing, the 'curl-config --vernum' returned '070908',
> and on my home machine where things build without issue the same
> command returns '070f05', so I took that value to do the comparison.
> Perhaps an intermediate value would work as well, but I don't have
> a suitable version to check.
>
> Signed-off-by:  Art Haas <ahaas@airmail.net>
>
> diff --git a/http.h b/http.h
> index 9ca16ac..aeff988 100644
> --- a/http.h
> +++ b/http.h
> @@ -22,6 +22,10 @@ #if LIBCURL_VERSION_NUM < 0x070c04
>  #define NO_CURL_EASY_DUPHANDLE
>  #endif
>  
> +#if LIBCURL_VERSION_NUM < 0x070f05
> +#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
> +#endif
> +
>  struct slot_results
>  {
>  	CURLcode curl_result;
>

> "Art Haas" <ahaas@airmail.net> writes:
> 
> > Here's a patch that does that. I patched 'http.h' as there is already
> > a number of other curl tests in that file. On the machine where the 
> > build was failing, the 'curl-config --vernum' returned '070908',
> > and on my home machine where things build without issue the same
> > command returns '070f05', so I took that value to do the comparison.
> > Perhaps an intermediate value would work as well, but I don't have
> > a suitable version to check.
> >
> > Signed-off-by:  Art Haas <ahaas@airmail.net>
> >
> > diff --git a/http.h b/http.h
> > index 9ca16ac..aeff988 100644
> > --- a/http.h
> > +++ b/http.h
> > @@ -22,6 +22,10 @@ #if LIBCURL_VERSION_NUM < 0x070c04
> >  #define NO_CURL_EASY_DUPHANDLE
> >  #endif
> >  
> > +#if LIBCURL_VERSION_NUM < 0x070f05
> > +#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
> > +#endif
> > +
> >  struct slot_results
> >  {
> >  	CURLcode curl_result;
> >
> 
> Eh, why not
> 
>         #ifndef CURLE_HTTP_RETURNED_ERROR
>         #define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
>         #endif

>> Eh, why not
>> 
>>         #ifndef CURLE_HTTP_RETURNED_ERROR
>>         #define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
>>         #endif
>
> Hi.
>
> Both 'CURLE_HTTP_RETURNED_ERROR' and 'CURLE_HTTP_NOT_FOUND' are part of
> an enumeration, not preprocessor '#define' values. I suppose that the
> odd-looking 'E' in the names is meant to signify 'enum'.

> Hi,
> 
> On Mon, 18 Sep 2006, Art Haas wrote:
> 
> > +#if LIBCURL_VERSION_NUM < 0x070f05
> > +#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
> > +#endif
> 
> If you go to 
> 
> http://cool.haxx.se/cvs.cgi/curl/include/curl/curl.h?annotate=1.308
> 
> and search for HTTP_RETURNED_ERROR, it shows that revision "badger_1.180" 
> introduced it, which you can verify by clicking on the link to the diff. 
> This diff also says that the LIBCURL_VERSION_NUM (which is changed just 
> after a release in the curl project) is 0x70a03. Thus, you should check 
> for 0x70a03 instead of 0x70f05.