From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 6 Jan 2008 12:56:34 +0000 (+0000)
Subject: make sure we deal with SOCKS5_HOSTNAME as a proxy type as well
X-Git-Tag: curl-7_18_0~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7138296633aa7ae7942eb3628de42b4dc2a2248b;p=thirdparty%2Fcurl.git

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

diff --git a/lib/ftp.c b/lib/ftp.c
index ea22cabe63..9507c6f484 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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