Commit 71382966 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

make sure we deal with SOCKS5_HOSTNAME as a proxy type as well

parent 195e94c0

lib/ftp.c

+2 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, 


          if(conn->bits.tunnel_proxy ||

             data->set.proxytype == CURLPROXY_SOCKS5 ||

             data->set.proxytype == CURLPROXY_SOCKS5_HOSTNAME ||

             data->set.proxytype == CURLPROXY_SOCKS4 ||

             data->set.proxytype == CURLPROXY_SOCKS4A)

            /* proxy tunnel -> use other host info because ip_addr_str is the
@@ -1782,6 +1783,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, 
            conn->ip_addr_str);

      if(conn->bits.tunnel_proxy ||

          data->set.proxytype == CURLPROXY_SOCKS5 ||

          data->set.proxytype == CURLPROXY_SOCKS5_HOSTNAME ||

          data->set.proxytype == CURLPROXY_SOCKS4 ||

          data->set.proxytype == CURLPROXY_SOCKS4A)

        /* proxy tunnel -> use other host info because ip_addr_str is the