romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 12:33:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

--ftp-pasv now overrides a previous --ftpport option. We now also support

Browse source 
it named "--ftp-port" as the additional dash between the words is used in
several other options and this makes it more consistant.
This commit is contained in:
Daniel Stenberg 2003-12-02 18:01:08 +00:00
parent 1b99d33b59
commit ad5ead8bed
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main.c
View file

@ -410,6 +410,7 @@ static void help(void)
" --crlf Convert LF to CRLF in upload",
" -f/--fail Fail silently (no output at all) on errors (H)",
" --ftp-create-dirs Create the remote dirs if not present (F)",
" --ftp-pasv Use PASV instead of PORT (F)",
" --ftp-ssl Enable SSL/TLS for the ftp transfer (F)",
" -F/--form <name=content> Specify HTTP multipart POST data (H)",
" -g/--globoff Disable URL sequences and ranges using {} and []",
@ -440,7 +441,7 @@ static void help(void)
" -O/--remote-name Write output to a file named as the remote file",
" -p/--proxytunnel Operate through a HTTP proxy tunnel (using CONNECT)",
" --proxy-ntlm Enable NTLM authentication on the proxy (H)",
" -P/--ftpport <address> Use PORT with address instead of PASV (F)",
" -P/--ftp-port <address> Use PORT with address instead of PASV (F)",
" -q If used as the first parameter disables .curlrc",
" -Q/--quote <cmd> Send command(s) to server before file transfer (F)",
" -r/--range <range> Retrieve a byte range from a HTTP/1.1 or FTP server",
@ -1190,6 +1191,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
{"*y", "max-filesize", TRUE},
{"*z", "disable-eprt", FALSE},
{"$a", "ftp-ssl", FALSE},
{"$b", "ftp-pasv", FALSE},
{"0", "http1.0", FALSE},
{"1", "tlsv1", FALSE},
{"2", "sslv2", FALSE},
@ -1237,7 +1239,8 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
{"o", "output", TRUE},
{"O", "remote-name", FALSE},
{"p", "proxytunnel", FALSE},
{"P", "ftpport", TRUE},
{"P", "ftpport", TRUE}, /* older version */
{"P", "ftp-port", TRUE},
{"q", "disable", FALSE},
{"Q", "quote", TRUE},
{"r", "range", TRUE},
@ -1504,6 +1507,11 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
case 'a': /* --ftp-ssl */
config->ftp_ssl ^= TRUE;
break;
case 'b': /* --ftp-pasv */
if(config->ftpport)
free(config->ftpport);
config->ftpport = NULL;
break;
}
break;
case '#': /* added 19990617 larsa */