summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-12-14 22:39:27 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-12-14 22:40:37 +0100
commit169fedbdce93ecf14befb6e0e1ce6a2d480252a3 (patch)
treea76338bb05eea5e6437424b88365ecf918526c1c /include
parent32b9c30e6705ca2b96b836cd0a8380b6a23478ff (diff)
downloadcurl-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 'include')
-rw-r--r--include/curl/curl.h2
-rw-r--r--include/curl/typecheck-gcc.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 9bee934a1..aafaeed2d 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1569,7 +1569,7 @@ typedef enum {
CINIT(DNS_LOCAL_IP6, OBJECTPOINT, 223),
/* Set authentication options directly */
- CINIT(OPTIONS, OBJECTPOINT, 224),
+ CINIT(LOGIN_OPTIONS, OBJECTPOINT, 224),
CURLOPT_LASTENTRY /* the last unused */
} CURLoption;
diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h
index 7feccf347..cdeba21a2 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/curl/typecheck-gcc.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -269,7 +269,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
(option) == CURLOPT_DNS_INTERFACE || \
(option) == CURLOPT_DNS_LOCAL_IP4 || \
(option) == CURLOPT_DNS_LOCAL_IP6 || \
- (option) == CURLOPT_OPTIONS || \
+ (option) == CURLOPT_LOGIN_OPTIONS || \
0)
/* evaluates to true if option takes a curl_write_callback argument */