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 /packages | |
| parent | 32b9c30e6705ca2b96b836cd0a8380b6a23478ff (diff) | |
| download | curl-169fedbdce93ecf14befb6e0e1ce6a2d480252a3.tar.gz | |
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 'packages')
| -rw-r--r-- | packages/OS400/README.OS400 | 2 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 2 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 62918c9b7..06e6632a2 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -85,11 +85,11 @@ options: CURLOPT_ISSUERCERT CURLOPT_KEYPASSWD CURLOPT_KRBLEVEL + CURLOPT_LOGIN_OPTIONS CURLOPT_MAIL_FROM CURLOPT_MAIL_AUTH CURLOPT_NETRC_FILE CURLOPT_NOPROXY - CURLOPT_OPTIONS CURLOPT_PASSWORD CURLOPT_PROXY CURLOPT_PROXYPASSWORD diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 0c99a47f9..34ca8dc23 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1148,11 +1148,11 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_ISSUERCERT: case CURLOPT_KEYPASSWD: case CURLOPT_KRBLEVEL: + case CURLOPT_LOGIN_OPTIONS: case CURLOPT_MAIL_FROM: case CURLOPT_MAIL_AUTH: case CURLOPT_NETRC_FILE: case CURLOPT_NOPROXY: - case CURLOPT_OPTIONS: case CURLOPT_PASSWORD: case CURLOPT_PROXY: case CURLOPT_PROXYPASSWORD: diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index bb8807ca3..831c9c722 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -1180,7 +1180,7 @@ d c 10222 d CURLOPT_DNS_LOCAL_IP6... d c 10223 - d CURLOPT_OPTIONS... + d CURLOPT_LOGIN_OPTIONS... d c 10224 * /if not defined(CURL_NO_OLDIES) |