Dominick Meglio pointed out FTPS should use default port 990 according to

IANA.

diff --git a/CHANGES b/CHANGES
index a6870f5e53683e55b2a3a623741b69d70f947f70..b1c9316f45be9b80cc1e0d7541e46f4e22512bbd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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.

diff --git a/lib/url.c b/lib/url.c
index aee9e16d2f3b26fee819630aa95d46d4f6ae43fa..4b71e070f4fccf7955dd043c6a24e20999c1cdbc 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -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 ce84b5b2b9bf11d4a4644fbe8a4d0de51702d2a3..7403bd731efb454360151b6ee2d10bb4549efbef 100644 (file)
--- 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