Commit 85daec25 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Honour --ftp-ssl-control on ftps:// URLs to allow encrypted control and 

unencrypted data connections.
parent 389a15a8

CHANGES

+8 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,14 @@ 




                                  Changelog

                                  Changelog





Dan F (7 March 2007)

- Honour --ftp-ssl-control on ftps:// URLs to allow encrypted control and

  unencrypted data connections.



Dan F (6 March 2007)

- Fixed a couple of improper pointer uses detected by valgrind in test

  cases 181 & 216.



Daniel (2 March 2007)

Daniel (2 March 2007)

- Robert A. Monat and Shmulik Regev helped out to fix the new */Makefile.vc8

- Robert A. Monat and Shmulik Regev helped out to fix the new */Makefile.vc8

  makefiles that are included in the source release archives, generated from

  makefiles that are included in the source release archives, generated from

lib/url.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3124,7 +3124,8 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
    if(strequal(conn->protostr, "FTPS")) {

    if(strequal(conn->protostr, "FTPS")) {

#ifdef USE_SSL

#ifdef USE_SSL

      conn->protocol |= PROT_FTPS|PROT_SSL;

      conn->protocol |= PROT_FTPS|PROT_SSL;

      conn->ssl[SECONDARYSOCKET].use = TRUE; /* send data securely */

      /* send data securely unless specifically requested otherwise */

      conn->ssl[SECONDARYSOCKET].use = data->set.ftp_ssl != CURLFTPSSL_CONTROL;

      port = PORT_FTPS;

      port = PORT_FTPS;

#else

#else

      failf(data, LIBCURL_NAME

      failf(data, LIBCURL_NAME