Commit c8ac7a0d authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

IANA.
parent 44031f32

CHANGES

+4 −0
Original line number Original line Diff line number Diff line
@@ -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.

lib/url.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -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 &&

lib/urldata.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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