diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2007-01-05 23:11:14 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2007-01-05 23:11:14 +0000 |
| commit | 4750e6f3c5fd42e19998242ddb63d7d5506b9fd9 (patch) | |
| tree | da414a616a37056c35bda6312721064e7d65839b /src | |
| parent | b7aaa4d9071227d481eb163887d7dd21535b7ae3 (diff) | |
- Linus Nielsen Feltzing introduced the --ftp-ssl-ccc command line option to
curl that uses the new CURLOPT_FTP_SSL_CCC option in libcurl. If enabled, it
will make libcurl shutdown SSL/TLS after the authentication is done on a
FTP-SSL operation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 5de0229ea..2dc94c115 100644 --- a/src/main.c +++ b/src/main.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2007, 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 @@ -349,6 +349,7 @@ struct Configurable { bool ftp_ssl; bool ftp_ssl_reqd; bool ftp_ssl_control; + bool ftp_ssl_ccc; char *socksproxy; /* set to server string */ int socksver; /* set to CURLPROXY_SOCKS* define */ @@ -529,6 +530,7 @@ static void help(void) " --ftp-ssl Try SSL/TLS for ftp transfer (F)", " --ftp-ssl-control Require SSL/TLS for ftp login, clear for transfer (F)", " --ftp-ssl-reqd Require SSL/TLS for ftp transfer (F)", + " --ftp-ssl-ccc Send CCC after authenticating (F)", " -F/--form <name=content> Specify HTTP multipart POST data (H)", " --form-string <name=string> Specify HTTP multipart POST data (H)", " -g/--globoff Disable URL sequences and ranges using {} and []", @@ -1355,6 +1357,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ {"$v", "ftp-ssl-reqd", FALSE}, {"$w", "no-sessionid", FALSE}, {"$x", "ftp-ssl-control", FALSE}, + {"$y", "ftp-ssl-ccc", FALSE}, {"0", "http1.0", FALSE}, {"1", "tlsv1", FALSE}, @@ -1779,6 +1782,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ case 'x': /* --ftp-ssl-control */ config->ftp_ssl_control ^= TRUE; break; + case 'y': /* --ftp-ssl-ccc */ + config->ftp_ssl_ccc ^= TRUE; + break; } break; case '#': /* --progress-bar */ @@ -4002,6 +4008,10 @@ operate(struct Configurable *config, int argc, char *argv[]) else if(config->ftp_ssl_control) curl_easy_setopt(curl, CURLOPT_FTP_SSL, CURLFTPSSL_CONTROL); + /* new in curl 7.16.1 */ + if(config->ftp_ssl_ccc) + curl_easy_setopt(curl, CURLOPT_FTP_SSL_CCC, TRUE); + /* new in curl 7.11.1, modified in 7.15.2 */ if(config->socksproxy) { curl_easy_setopt(curl, CURLOPT_PROXY, config->socksproxy); |