1 files changed, 19 insertions, 0 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index e33f4b38f..47cb361aa 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1184,6 +1184,16 @@ CURLcode ftp_use_port(struct connectdata *conn)
     return CURLE_FTP_PORT_FAILED;
   }
 
+#ifdef PF_INET6
+  if(!conn->bits.ftp_use_eprt &&
+     (conn->ip_addr->ai_family == PF_INET6)) {
+    /* EPRT is disabled but we are connected to a IPv6 host, so we ignore the
+       request! */
+    conn->bits.ftp_use_eprt = TRUE;
+  }
+#endif
+
+
   for (fcmd = EPRT; fcmd != DONE; fcmd++) {
     int lprtaf, eprtaf;
     int alen=0, plen=0;
@@ -1512,6 +1522,15 @@ CURLcode ftp_use_pasv(struct connectdata *conn,
   char newhost[48];
   char *newhostp=NULL;
 
+#ifdef PF_INET6
+  if(!conn->bits.ftp_use_epsv &&
+     (conn->ip_addr->ai_family == PF_INET6)) {
+    /* EPSV is disabled but we are connected to a IPv6 host, so we ignore the
+       request! */
+    conn->bits.ftp_use_epsv = TRUE;
+  }
+#endif
+
   for (modeoff = (conn->bits.ftp_use_epsv?0:1);
        mode[modeoff]; modeoff++) {
     result = Curl_ftpsendf(conn, "%s", mode[modeoff]);