From 53db15ba5524584196eedb3abe8d2e97fb5a3cc0 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sat, 3 Nov 2018 16:58:18 +0100 Subject: netrc: don't ignore the login name specified with "--user" - for "--netrc", don't ignore the login/password specified with "--user", only ignore the login/password in the URL. This restores the netrc behaviour of curl 7.61.1 and earlier. - fix the documentation of CURL_NETRC_REQUIRED - improve the detection of login/password changes when reading .netrc - don't read .netrc if both login and password are already set Fixes #3213 Closes #3224 --- docs/cmdline-opts/netrc-file.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/cmdline-opts') diff --git a/docs/cmdline-opts/netrc-file.d b/docs/cmdline-opts/netrc-file.d index 0b5d2400c..50126d255 100644 --- a/docs/cmdline-opts/netrc-file.d +++ b/docs/cmdline-opts/netrc-file.d @@ -5,7 +5,7 @@ Added: 7.21.5 Mutexed: netrc --- This option is similar to --netrc, except that you provide the path (absolute -or relative) to the netrc file that Curl should use. You can only specify one +or relative) to the netrc file that curl should use. You can only specify one netrc file per invocation. If several --netrc-file options are provided, the last one will be used. -- cgit v1.2.3