moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-13 13:05:03 -05:00
Code Issues Releases Wiki Activity

Peter Heuchert made sure the CURLFTPSSL_CONTROL setting for CURLOPT_FTP_SSL

Browse Source 
is used properly.
This commit is contained in:
Daniel Stenberg 2006-03-07 22:28:08 +00:00
parent 8bba99ae56
commit b8c8e7349f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -6,6 +6,10 @@
Changelog Changelog
Daniel (7 March 2006)
- Peter Heuchert made sure the CURLFTPSSL_CONTROL setting for CURLOPT_FTP_SSL
is used properly.
Daniel (6 March 2006) Daniel (6 March 2006)
- Lots of users on Windows have reported getting the "SSL: couldn't set - Lots of users on Windows have reported getting the "SSL: couldn't set
callback" error message so I've now made the setting of that callback not be callback" error message so I've now made the setting of that callback not be

3
RELEASE-NOTES
View File

@ -15,6 +15,7 @@ This release includes the following changes:
This release includes the following bugfixes: This release includes the following bugfixes:
o the CURLFTPSSL_CONTROL setting for CURLOPT_FTP_SSL is acknowledged
o "SSL: couldn't set callback" is now a less serious problem o "SSL: couldn't set callback" is now a less serious problem
o Interix build fix o Interix build fix
o fixed "hang" when out of file handles at start o fixed "hang" when out of file handles at start
@ -27,6 +28,6 @@ Other curl-related news since the previous public release:
This release would not have looked like this without help, code, reports and This release would not have looked like this without help, code, reports and
advice from friends like these: advice from friends like these:
Gisle Vanem, Dan Fandrich, Thomas Klausner, Todd Vierling Gisle Vanem, Dan Fandrich, Thomas Klausner, Todd Vierling, Peter Heuchert
Thanks! (and sorry if I forgot to mention someone) Thanks! (and sorry if I forgot to mention someone)

6
lib/ftp.c
View File

@ -2456,7 +2456,8 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
2)Private (requested by 'PROT P') 2)Private (requested by 'PROT P')
*/ */
if(!conn->ssl[SECONDARYSOCKET].use) { 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); state(conn, FTP_PROT);
} }
else { else {
@ -2470,7 +2471,8 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
case FTP_PROT: case FTP_PROT:
if(ftpcode/100 == 2) if(ftpcode/100 == 2)
/* We have enabled SSL for the data connection! */ /* 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 /* FTP servers typically responds with 500 if they decide to reject
our 'P' request */ our 'P' request */
else if(data->set.ftp_ssl> CURLFTPSSL_CONTROL) else if(data->set.ftp_ssl> CURLFTPSSL_CONTROL)