mirror of
https://github.com/moparisthebest/curl
synced 2024-12-24 09:08:49 -05:00
ftp: shut down the secondary connection properly when SSL is used
Reported-by: Neal Poole Fixes #5340 Closes #5385
This commit is contained in:
parent
aa6cf7f3b6
commit
f002c850d9
@ -221,6 +221,7 @@ static void close_secondarysocket(struct connectdata *conn)
|
||||
conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
|
||||
}
|
||||
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) {
|
||||
/* The secondary socket is using SSL so we must close down that part
|
||||
first before we close the socket for real */
|
||||
Curl_ssl_close(conn, SECONDARYSOCKET);
|
||||
/* The secondary socket used SSL so we must close down that part first
|
||||
before we close the socket for real */
|
||||
result = Curl_ssl_shutdown(conn, SECONDARYSOCKET);
|
||||
|
||||
/* Note that we keep "use" set to TRUE since that (next) connection is
|
||||
still requested to use SSL */
|
||||
|
Loading…
Reference in New Issue
Block a user