From f2584627c8314b5954645ed4e05f48868928bd87 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Tue, 12 Nov 2013 19:01:04 +0000 Subject: curl_easy_setopt: Added the ability to set the login options separately Rather than set the authentication options as part of the login details specified in the URL, or via the older CURLOPT_USERPWD option, added a new libcurl option to allow the login options to be set separately. --- docs/libcurl/curl_easy_setopt.3 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'docs/libcurl/curl_easy_setopt.3') diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index fb22306eb..0b507d856 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -1164,14 +1164,23 @@ user name to use for the transfer. authentication. You should not use this option together with the (older) CURLOPT_USERPWD option. -In order to specify the password to be used in conjunction with the user name -use the \fICURLOPT_PASSWORD\fP option. (Added in 7.19.1) +To specify the password and login options, along with the user name, use the +\fICURLOPT_PASSWORD\fP and \fICURLOPT_OPTIONS\fP options or alternatively use +the older \CURLOPT_USERPWD\fP option instead. (Added in 7.19.1) .IP CURLOPT_PASSWORD Pass a char * as parameter, which should be pointing to the zero terminated password to use for the transfer. -The CURLOPT_PASSWORD option should be used in conjunction with -the \fICURLOPT_USERNAME\fP option. (Added in 7.19.1) +The CURLOPT_PASSWORD option should be used in conjunction with the +\fICURLOPT_USERNAME\fP option. (Added in 7.19.1) +.IP CURLOPT_OPTIONS +Pass a char * as parameter, which should be pointing to the zero terminated +options string to use for the transfer. + +\CURLOPT_OPTIONS\fP can be used to set protocol specific authentication options, +such as the preferred authentication mechanism via "AUTH=NTLM" or "AUTH=*", and +should be used in conjunction with the \fICURLOPT_USERNAME\fP option. (Added in +7.34.0) .IP CURLOPT_PROXYUSERNAME Pass a char * as parameter, which should be pointing to the zero terminated user name to use for the transfer while connecting to Proxy. -- cgit v1.2.3