From: Laurie Clark-Michalek <lcm@fb.com>
Date: Wed, 28 Mar 2018 14:42:33 +0000 (+0100)
Subject: FTP: allow PASV on IPv6 connections when a proxy is being used
X-Git-Tag: curl-7_60_0~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f3938bc4a9c41e2ecf05c081f27e7b83f82f073;p=thirdparty%2Fcurl.git

FTP: allow PASV on IPv6 connections when a proxy is being used

In the situation of a client connecting to an FTP server using an IPv6
tunnel proxy, the connection info will indicate that the connection is
IPv6. However, because the server behing the proxy is IPv4, it is
permissable to attempt PSV mode. In the case of the FTP server being
IPv4 only, EPSV will always fail, and with the current logic curl will
be unable to connect to the server, as the IPv6 fwdproxy causes curl to
think that EPSV is impossible.

Closes #2432
---

diff --git a/lib/ftp.c b/lib/ftp.c
index 0cc583ba7a..ef97d08bbe 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1788,7 +1788,7 @@ static CURLcode ftp_epsv_disable(struct connectdata *conn)
 {
   CURLcode result = CURLE_OK;
 
-  if(conn->bits.ipv6) {
+  if(conn->bits.ipv6 && !(conn->bits.tunnel_proxy || conn->bits.socksproxy)) {
     /* We can't disable EPSV when doing IPv6, so this is instead a fail */
     failf(conn->data, "Failed EPSV attempt, exiting\n");
     return CURLE_WEIRD_SERVER_REPLY;