generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
IANA.
This commit is contained in:
Daniel Stenberg
2004-01-11 22:56:36 +00:00
parent 44031f32a1
commit c8ac7a0d95
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -7,6 +7,10 @@
Changelog Changelog
Daniel (11 January 2004)
- Dominick Meglio pointed out FTPS should use default port 990 according to
IANA.
Daniel (8 January 2004) Daniel (8 January 2004)
- Fixed the SPNEGO configure check to not use -R or other non-portable options - Fixed the SPNEGO configure check to not use -R or other non-portable options
in the LDFLAGS. Reported by Pierre in bug report #872930. in the LDFLAGS. Reported by Pierre in bug report #872930.

6
lib/url.c
View File

@@ -2441,11 +2441,13 @@ static CURLcode CreateConnection(struct SessionHandle *data,
/* MN 06/07/02 */ /* MN 06/07/02 */
#ifndef CURL_DISABLE_FTP #ifndef CURL_DISABLE_FTP
char *type; char *type;
int port = PORT_FTP;
if(strequal(conn->protostr, "FTPS")) { if(strequal(conn->protostr, "FTPS")) {
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
conn->protocol |= PROT_FTPS|PROT_SSL; conn->protocol |= PROT_FTPS|PROT_SSL;
conn->ssl[SECONDARYSOCKET].use = TRUE; /* send data securely */ conn->ssl[SECONDARYSOCKET].use = TRUE; /* send data securely */
port = PORT_FTPS;
#else #else
failf(data, LIBCURL_NAME failf(data, LIBCURL_NAME
" was built with SSL disabled, ftps: not supported!"); " 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)? conn->port = (data->set.use_port && data->state.allow_port)?
data->set.use_port:PORT_FTP; data->set.use_port:port;
conn->remote_port = PORT_FTP; conn->remote_port = port;
conn->protocol |= PROT_FTP; conn->protocol |= PROT_FTP;
if(data->change.proxy && if(data->change.proxy &&

1
lib/urldata.h
View File

@@ -28,6 +28,7 @@
#include "setup.h" #include "setup.h"
#define PORT_FTP 21 #define PORT_FTP 21
#define PORT_FTPS 990
#define PORT_TELNET 23 #define PORT_TELNET 23
#define PORT_GOPHER 70 #define PORT_GOPHER 70
#define PORT_HTTP 80 #define PORT_HTTP 80