diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-12-14 22:39:27 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-12-14 22:40:37 +0100 |
| commit | 169fedbdce93ecf14befb6e0e1ce6a2d480252a3 (patch) | |
| tree | a76338bb05eea5e6437424b88365ecf918526c1c /docs/libcurl | |
| parent | 32b9c30e6705ca2b96b836cd0a8380b6a23478ff (diff) | |
login options: remove the ;[options] support from CURLOPT_USERPWD
To avoid the regression when users pass in passwords containing semi-
colons, we now drop the ability to set the login options with the same
options. Support for login options in CURLOPT_USERPWD was added in
7.31.0.
Test case 83 was modified to verify that colons and semi-colons can be
used as part of the password when using -u (CURLOPT_USERPWD).
Bug: http://curl.haxx.se/bug/view.cgi?id=1311
Reported-by: Petr Bahula
Assisted-by: Steve Holme
Signed-off-by: Daniel Stenberg <daniel@haxx.se>
Diffstat (limited to 'docs/libcurl')
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 14 | ||||
| -rw-r--r-- | docs/libcurl/symbols-in-versions | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 51edaea97..2cfa2663c 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -1165,22 +1165,22 @@ authentication. You should not use this option together with the (older) CURLOPT_USERPWD option. 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) +\fICURLOPT_PASSWORD\fP and \fICURLOPT_LOGIN_OPTIONS\fP options. (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) -.IP CURLOPT_OPTIONS +.IP CURLOPT_LOGIN_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) +\CURLOPT_LOGIN_OPTIONS\fP can be used to set protocol specific login 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 e9d77194d..432f180ec 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -395,6 +395,7 @@ CURLOPT_KRB4LEVEL 7.3 7.17.0 CURLOPT_KRBLEVEL 7.16.4 CURLOPT_LOCALPORT 7.15.2 CURLOPT_LOCALPORTRANGE 7.15.2 +CURLOPT_LOGIN_OPTIONS 7.34.0 CURLOPT_LOW_SPEED_LIMIT 7.1 CURLOPT_LOW_SPEED_TIME 7.1 CURLOPT_MAIL_AUTH 7.25.0 @@ -418,7 +419,6 @@ 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 |