From 85daec253cf5a6e1eb3f023e76180f553c715de8 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Wed, 7 Mar 2007 22:42:05 +0000
Subject: Honour --ftp-ssl-control on ftps:// URLs to allow encrypted control
 and unencrypted data connections.

---
 lib/url.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/url.c b/lib/url.c
index 87a07736e..b80d79239 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3124,7 +3124,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
     if(strequal(conn->protostr, "FTPS")) {
 #ifdef USE_SSL
       conn->protocol |= PROT_FTPS|PROT_SSL;
-      conn->ssl[SECONDARYSOCKET].use = TRUE; /* send data securely */
+      /* send data securely unless specifically requested otherwise */
+      conn->ssl[SECONDARYSOCKET].use = data->set.ftp_ssl != CURLFTPSSL_CONTROL;
       port = PORT_FTPS;
 #else
       failf(data, LIBCURL_NAME
-- 
cgit v1.2.3