[GNUnet-SVN] [gnurl] 53/178: FTP: allow PASV on IPv6 connections when a proxy is being used

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 5f3938bc4a9c41e2ecf05c081f27e7b83f82f073
Author: Laurie Clark-Michalek <address@hidden>
AuthorDate: Wed Mar 28 15:42:33 2018 +0100

    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
---
 lib/ftp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ftp.c b/lib/ftp.c
index 0cc583ba7..ef97d08bb 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;

-- 
To stop receiving notification emails like this one, please contact
address@hidden