From: Stefan Eissing <stefan@eissing.org>
Date: Fri, 3 Mar 2023 14:15:31 +0000 (+0100)
Subject: ftp: active mode with SSL, add the damn filter
X-Git-Tag: curl-8_0_0~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a26418cf14b987d6c3221a8084600a2ee463609d;p=thirdparty%2Fcurl.git

ftp: active mode with SSL, add the damn filter

- since 7.87.0 we lost adding the SSL filter for an active
  FTP connection that uses SSL. This leads to hangers and timeouts
  as reported in #10666.

Reported-by: SandakovMM on github
Fixes #10666
Closes #10669
---

diff --git a/lib/ftp.c b/lib/ftp.c
index 3777e03878..163262f1af 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -436,6 +436,12 @@ static CURLcode InitiateTransfer(struct Curl_easy *data)
   bool connected;
 
   DEBUGF(infof(data, "ftp InitiateTransfer()"));
+  if(conn->bits.ftp_use_data_ssl && data->set.ftp_use_port &&
+     !Curl_conn_is_ssl(conn, SECONDARYSOCKET)) {
+    result = Curl_ssl_cfilter_add(data, conn, SECONDARYSOCKET);
+    if(result)
+      return result;
+  }
   result = Curl_conn_connect(data, SECONDARYSOCKET, TRUE, &connected);
   if(result || !connected)
     return result;