Merge branch 'ps/http-gssapi-cred-delegation'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2016 21:53:11 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2016 21:53:11 +0000 (14:53 -0700)
In recent versions of cURL, GSSAPI credential delegation is
disabled by default due to CVE-2011-2192; introduce a configuration
to selectively allow enabling this.

* ps/http-gssapi-cred-delegation:
http: control GSSAPI credential delegation

1  2 
Documentation/config.txt
http.c
Simple merge
diff --cc http.c
Simple merge