romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 08:13:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

SSL: check for SSL, not specific protocols

Browse source 
Code cleanup to check less for protocols and more for the specific
relevant feature. Like if SSL is required.
This commit is contained in:
Daniel Stenberg 2011-05-05 15:49:43 +02:00
parent 335dfa793c
commit e34131db78
6 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ftp.c
View file

@ -2946,10 +2946,8 @@ static CURLcode ftp_connect(struct connectdata *conn,
return result;
}
if(conn->handler->protocol & CURLPROTO_FTPS) {
if(conn->handler->flags & PROTOPT_SSL) {
/* BLOCKING */
/* FTPS is simply ftp with SSL for the control channel */
/* now, perform the SSL initialization for this socket */
result = Curl_ssl_connect(conn, FIRSTSOCKET);
if(result)
return result;