diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | lib/url.c | 6 | ||||
| -rw-r--r-- | lib/urldata.h | 1 |
3 files changed, 9 insertions, 2 deletions
@@ -7,6 +7,10 @@ Changelog +Daniel (11 January 2004) +- Dominick Meglio pointed out FTPS should use default port 990 according to + IANA. + Daniel (8 January 2004) - Fixed the SPNEGO configure check to not use -R or other non-portable options in the LDFLAGS. Reported by Pierre in bug report #872930. @@ -2441,11 +2441,13 @@ static CURLcode CreateConnection(struct SessionHandle *data, /* MN 06/07/02 */ #ifndef CURL_DISABLE_FTP char *type; + int port = PORT_FTP; if(strequal(conn->protostr, "FTPS")) { #ifdef USE_SSLEAY conn->protocol |= PROT_FTPS|PROT_SSL; conn->ssl[SECONDARYSOCKET].use = TRUE; /* send data securely */ + port = PORT_FTPS; #else failf(data, LIBCURL_NAME " was built with SSL disabled, ftps: not supported!"); @@ -2454,8 +2456,8 @@ static CURLcode CreateConnection(struct SessionHandle *data, } conn->port = (data->set.use_port && data->state.allow_port)? - data->set.use_port:PORT_FTP; - conn->remote_port = PORT_FTP; + data->set.use_port:port; + conn->remote_port = port; conn->protocol |= PROT_FTP; if(data->change.proxy && diff --git a/lib/urldata.h b/lib/urldata.h index ce84b5b2b..7403bd731 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -28,6 +28,7 @@ #include "setup.h" #define PORT_FTP 21 +#define PORT_FTPS 990 #define PORT_TELNET 23 #define PORT_GOPHER 70 #define PORT_HTTP 80 |