diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 17 | ||||
| -rw-r--r-- | docs/libcurl/symbols-in-versions | 1 |
2 files changed, 14 insertions, 4 deletions
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. diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index ac679d9d4..9f2fe9f75 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -417,6 +417,7 @@ CURLOPT_NOSIGNAL 7.10 CURLOPT_NOTHING 7.1.1 7.11.1 7.11.0 CURLOPT_OPENSOCKETDATA 7.17.1 CURLOPT_OPENSOCKETFUNCTION 7.17.1 +CURLOPT_OPTIONS 7.34.0 CURLOPT_PASSWDDATA 7.4.2 7.11.1 7.15.5 CURLOPT_PASSWDFUNCTION 7.4.2 7.11.1 7.15.5 CURLOPT_PASSWORD 7.19.1 |