Merge branch 'tc/curl-with-backports'
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 17:20:02 +0000 (10:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 17:20:02 +0000 (10:20 -0700)
commit6ea13d88456c116b14c3bc756993b5f462c981cb
tree3e7f29081b6d18c0a37ef00f59f8d8f19b51a464
parentd1615f93aca8e0380022066910701aaab29c690e
parentdd5df538b501661f60ffed3eb8486b9eed138c48
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_*
http.c