aboutsummaryrefslogtreecommitdiff
path: root/src/tool_operate.c
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 /src/tool_operate.c
parent32b9c30e6705ca2b96b836cd0a8380b6a23478ff (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 'src/tool_operate.c')
-rw-r--r--src/tool_operate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 7b43691bb..7cb807734 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1051,6 +1051,8 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
my_setopt(curl, CURLOPT_NETRC_FILE, config->netrc_file);
my_setopt(curl, CURLOPT_TRANSFERTEXT, config->use_ascii?1L:0L);
+ if(config->login_options)
+ my_setopt_str(curl, CURLOPT_LOGIN_OPTIONS, config->login_options);
my_setopt_str(curl, CURLOPT_USERPWD, config->userpwd);
my_setopt_str(curl, CURLOPT_RANGE, config->range);
my_setopt(curl, CURLOPT_ERRORBUFFER, errorbuffer);