moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 09:08:49 -05:00
Code Issues Releases Wiki Activity

ftp: shut down the secondary connection properly when SSL is used

Browse Source 
Reported-by: Neal Poole
Fixes #5340
Closes #5385
This commit is contained in:
Daniel Stenberg 2020-05-13 12:22:49 +02:00
parent aa6cf7f3b6
commit f002c850d9
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ftp.c
View File

@ -221,6 +221,7 @@ static void close_secondarysocket(struct connectdata *conn)
conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
} }
conn->bits.tcpconnect[SECONDARYSOCKET] = FALSE; conn->bits.tcpconnect[SECONDARYSOCKET] = FALSE;
conn->bits.proxy_ssl_connected[SECONDARYSOCKET] = FALSE;
} }
/* /*
@ -3231,9 +3232,9 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
} }
if(conn->ssl[SECONDARYSOCKET].use) { if(conn->ssl[SECONDARYSOCKET].use) {
/* The secondary socket is using SSL so we must close down that part /* The secondary socket used SSL so we must close down that part first
first before we close the socket for real */ before we close the socket for real */
Curl_ssl_close(conn, SECONDARYSOCKET); result = Curl_ssl_shutdown(conn, SECONDARYSOCKET);
/* Note that we keep "use" set to TRUE since that (next) connection is /* Note that we keep "use" set to TRUE since that (next) connection is
still requested to use SSL */ still requested to use SSL */