summaryrefslogtreecommitdiff
path: root/docs/FEATURES
diff options
context:
space:
mode:
authorMichael Osipov <1983-01-06@gmx.net>2014-08-02 13:51:18 +0100
committerSteve Holme <steve_holme@hotmail.com>2014-08-09 00:08:51 +0100
commit37f0e8a32cf9ad0a87f8c60cfa12b65e61be15a9 (patch)
treeb23a0bfd6014d2409a41cc23ea4a6fd388fd20f3 /docs/FEATURES
parentb91e97eabd3a91b7362bc33aa4ef9d114b8aead1 (diff)
downloadcurl-37f0e8a32cf9ad0a87f8c60cfa12b65e61be15a9.tar.gz
docs: Update SPNEGO and GSS-API related doc sections
Reflect recent changes in SPNEGO and GSS-API code in the docs. Update them with appropriate namings and remove visible spots for GSS-Negotiate.
Diffstat (limited to 'docs/FEATURES')
-rw-r--r--docs/FEATURES10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/FEATURES b/docs/FEATURES
index 53cd54f71..961013e94 100644
--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -45,8 +45,8 @@ HTTP
- POST
- Pipelining
- multipart formpost (RFC1867-style)
- - authentication: Basic, Digest, NTLM (*9), Negotiate (*3) and to server and
- proxy
+ - authentication: Basic, Digest, NTLM (*9) and Negotiate (SPNEGO) (*3)
+ to server and proxy
- resume (both GET and PUT)
- follow redirects
- maximum amount of redirects to follow
@@ -78,7 +78,7 @@ FTP
- download
- authentication
- kerberos4 (*5)
- - kerberos5 (*3)
+ - Kerberos 5 (*14)
- active/passive using PORT, EPRT, PASV or EPSV
- single file size information (compare to HTTP HEAD)
- 'type=' URL support
@@ -180,7 +180,8 @@ FOOTNOTES
*1 = requires OpenSSL, GnuTLS, NSS, yassl, axTLS, PolarSSL, WinSSL (native
Windows), Secure Transport (native iOS/OS X) or qssl (native IBM i)
*2 = requires OpenLDAP
- *3 = requires a GSSAPI-compliant library, such as Heimdal or similar
+ *3 = requires a GSS-API implementation (such as Heimdal or MIT Kerberos) or
+ SSPI (native Windows)
*4 = requires nghttp2 and possibly a recent TLS library
*5 = requires a krb4 library, such as the MIT one or similar
*6 = requires c-ares
@@ -195,3 +196,4 @@ FOOTNOTES
*12 = requires libz
*13 = requires libmetalink, and either an Apple or Microsoft operating
system, or OpenSSL, or GnuTLS, or NSS
+ *14 = requires a GSS-API implementation (such as Heimdal or MIT Kerberos)