Re: [PATCH 1/2] http.c: fix compiling with libcurl 7.9.2

Mark Lodato [off-list ref] writes:

Change the minimimum required libcurl version for the http.sslKey option
to 7.9.3.  Previously, preprocessor macros checked for >= 7.9.2, which
is incorrect because CURLOPT_SSLKEY was introduced in 7.9.3.  This now
allows git to compile with libcurl 7.9.2.

Signed-off-by: Mark Lodato <redacted>
---

This patch series is independent of my other password prompting patch
series, and is based off 'next', which includes Tay Ray Chuan's recent
http changes.

In other words, this needs to be queued on top of rc/http-push series, and
the review process should involve the original author (Cc'ed).

Tay, comments?

Note that git still does not compile on libcurl before 7.9.1 or below,
since CURLOPT_FTP_USE_EPSV (http.c:236) is defined in libcurl 7.9.2.

I think we didn't quite follow an old thread through, then.  

Cf. http://thread.gmane.org/gmane.comp.version-control.git/113985/focus=114014

Both Mike's in the thread Cc'ed.

One question: In http.c, there are unnecessary #if LIBCURL_VERSION_NUM's
surrounding the global variable declarations, in http_options(), and in
http_init().  Is there a reason why these exist?  If not, I think
removing them would make the code easier to read.

Yeah, as long as get_curl_handle() is still protected not to call
curl_easy_setopt() with an option that is unknown to the version of
libcURL, I think the config reader and variable declarations, and
definitions can lose conditional compilation and it would make the overall
code easier to read.

Thanks.

Hi,

On Mon, Jun 15, 2009 at 12:35 PM, Junio C Hamano[off-list ref] wrote:

In other words, this needs to be queued on top of rc/http-push series, and
the review process should involve the original author (Cc'ed).

Tay, comments?

Thanks for the heads-up. I don't have anything to add, since Mark's
work doesn't really affect mine (http fetching logic).

-- 
Cheers,
Ray Chuan

2009/6/15 Junio C Hamano [off-list ref]

Mark Lodato [off-list ref] writes:

quoted

Note that git still does not compile on libcurl before 7.9.1 or below,
since CURLOPT_FTP_USE_EPSV (http.c:236) is defined in libcurl 7.9.2.

I think we didn't quite follow an old thread through, then.

Cf. http://thread.gmane.org/gmane.comp.version-control.git/113985/focus=114014

Both Mike's in the thread Cc'ed.

Yep, apologies for having dropped the ball on this. I had got back to
it but parked it again while Ray Chaun's series was in flight.

Will be offline for a couple of weeks around solstice / Glastonbury
but able to pick it up again after that if no-one beats me to it. I've
noted Daniel's point below also:

2009/6/12 Daniel Stenberg [off-list ref]:

On Thu, 11 Jun 2009, Junio C Hamano wrote:

quoted

  #if !defined(CURLOPT_KEYPASSWD)
  # if defined(CURLOPT_SSLKEYPASSWD)
  #  define CURLOPT_KEYTPASSWD CURLOPT_SSLKEYPASSWD
  # elif defined(CURLOPT_SSLCERTPASSWD
  #  define CURLOPT_KEYTPASSWD CURLOPT_SSLCERTPASSWD
  # endif
  #endif

Just note that these CURLOPT_* symbols provided by libcurl are enums, not
defines, so unfortunately you can't do it this exact #ifdef way.

Mike