From b8c8e7349fef49e9027080632e9581f0c76d974b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 7 Mar 2006 22:28:08 +0000 Subject: Peter Heuchert made sure the CURLFTPSSL_CONTROL setting for CURLOPT_FTP_SSL is used properly. --- lib/ftp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/ftp.c b/lib/ftp.c index da2aeb9e2..3d29b349f 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -2456,7 +2456,8 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) 2)Private (requested by 'PROT P') */ if(!conn->ssl[SECONDARYSOCKET].use) { - NBFTPSENDF(conn, "PROT %c", 'P'); + NBFTPSENDF(conn, "PROT %c", + data->set.ftp_ssl == CURLFTPSSL_CONTROL ? 'C' : 'P'); state(conn, FTP_PROT); } else { @@ -2470,7 +2471,8 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) case FTP_PROT: if(ftpcode/100 == 2) /* We have enabled SSL for the data connection! */ - conn->ssl[SECONDARYSOCKET].use = TRUE; + conn->ssl[SECONDARYSOCKET].use = + data->set.ftp_ssl > CURLFTPSSL_CONTROL; /* FTP servers typically responds with 500 if they decide to reject our 'P' request */ else if(data->set.ftp_ssl> CURLFTPSSL_CONTROL) -- cgit v1.2.3