From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Aug 2017 17:20:02 +0000 (-0700)
Subject: Merge branch 'tc/curl-with-backports'
X-Git-Tag: v2.15.0-rc0~135
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ea13d88456c116b14c3bc756993b5f462c981cb;p=git-core%2Fgit.git

Merge branch 'tc/curl-with-backports'

Updates to the HTTP layer we made recently unconditionally used
features of libCurl without checking the existence of them, causing
compilation errors, which has been fixed.  Also migrate the code to
check feature macros, not version numbers, to cope better with
libCurl that vendor ships with backported features.

* tc/curl-with-backports:
  http: use a feature check to enable GSSAPI delegation control
  http: fix handling of missing CURLPROTO_*
---

6ea13d88456c116b14c3bc756993b5f462c981cb