diff options
author | Daniel Gustafsson <daniel@yesql.se> | 2019-05-21 09:38:11 +0200 |
---|---|---|
committer | Daniel Gustafsson <daniel@yesql.se> | 2019-05-21 09:38:11 +0200 |
commit | 8986d3c6f4f72cb4734f24ef297d31865e3018cc (patch) | |
tree | ce317f1f0b21ce2b94edff58c8c17c5e7c3fe20e /lib/vtls/openssl.c | |
parent | 31b77c1877a807ab6184b22ab2310e096536b9b5 (diff) |
ftp: move ftp_ccc in under featureflag
Commit e91e48161235272ff485ff32bd048c53af731f43 moved ftp_ccc in under
the FTP featureflag in the UserDefined struct, but vtls callsites were
still using it unprotected.
Closes #3912
Fixes: https://curl.haxx.se/dev/log.cgi?id=20190520044705-29865
Reviewed-by: Daniel Stenberg, Marcel Raad
Diffstat (limited to 'lib/vtls/openssl.c')
-rw-r--r-- | lib/vtls/openssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index df4553423..85e9be616 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1308,6 +1308,7 @@ static int Curl_ossl_shutdown(struct connectdata *conn, int sockindex) int err; bool done = FALSE; +#ifndef CURL_DISABLE_FTP /* This has only been tested on the proftpd server, and the mod_tls code sends a close notify alert without waiting for a close notify alert in response. Thus we wait for a close notify alert from the server, but @@ -1315,6 +1316,7 @@ static int Curl_ossl_shutdown(struct connectdata *conn, int sockindex) if(data->set.ftp_ccc == CURLFTPSSL_CCC_ACTIVE) (void)SSL_shutdown(BACKEND->handle); +#endif if(BACKEND->handle) { buffsize = (int)sizeof(buf); |