From: Junio C Hamano Date: Tue, 22 Aug 2017 22:09:37 +0000 (-0700) Subject: Merge branch 'tc/curl-with-backports' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/06c21e1eb9f09bd4c6887632ea55dbb3c3eb36ae Merge branch 'tc/curl-with-backports' into next 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_* --- 06c21e1eb9f09bd4c6887632ea55dbb3c3eb36ae