more SOCKS5_HOSTNAME adjustments from Richard Atterer

diff --git a/lib/ftp.c b/lib/ftp.c
index 9507c6f4847d514ca8dacfb6e2b94d1c99de278d..29cbcb0f894ac61b9bc2450347fa59e02c8e3a27 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1882,6 +1882,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
 
   switch(data->set.proxytype) {
   case CURLPROXY_SOCKS5:
+  case CURLPROXY_SOCKS5_HOSTNAME:
     result = Curl_SOCKS5(conn->proxyuser, conn->proxypasswd, newhost, newport,
                          SECONDARYSOCKET, conn);
     break;

diff --git a/lib/url.c b/lib/url.c
index 8e2405373a4f5c889f33795c111aecef69d07182..25d40b922202d5da5d634c352fbb0473981824c0 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -1868,7 +1868,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
 
   case CURLOPT_PROXYTYPE:
     /*
-     * Set proxy type. HTTP/SOCKS4/SOCKS4a/SOCKS5
+     * Set proxy type. HTTP/SOCKS4/SOCKS4a/SOCKS5/SOCKS5_HOSTNAME
      */
     data->set.proxytype = (curl_proxytype)va_arg(param, long);
     break;