Made host name and proxy name get stored in a 'struct hostname' and set

all things up to work with encoded host names internally, as well as keeping
'display names' to show in debug messages. IDN resolves work for me now using
ipv6, ipv4 and ares resolving. Even cookies on IDN sites seem to do right.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/ftp.c b/lib/ftp.c
index 6333bb422..17632044b 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -489,7 +489,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
   if (data->set.tunnel_thru_httpproxy) {
     /* We want "seamless" FTP operations through HTTP proxy tunnel */
     result = Curl_ConnectHTTPProxyTunnel(conn, FIRSTSOCKET,
-                                         conn->hostname, conn->remote_port);
+                                         conn->host.name, conn->remote_port);
     if(CURLE_OK != result)
       return result;
   }
@@ -1619,7 +1619,7 @@ CURLcode ftp_use_pasv(struct connectdata *conn,
           newport = num;
 
           /* we should use the same host we already are connected to */
-          newhostp = conn->hostname;
+          newhostp = conn->host.name;
         }
       }                      
       else
@@ -1641,7 +1641,7 @@ CURLcode ftp_use_pasv(struct connectdata *conn,
      * We don't want to rely on a former host lookup that might've expired
      * now, instead we remake the lookup here and now!
      */
-    rc = Curl_resolv(conn, conn->proxyhost, conn->port, &addr);
+    rc = Curl_resolv(conn, conn->proxy.name, conn->port, &addr);
     if(rc == CURLRESOLV_PENDING)
       rc = Curl_wait_for_resolv(conn, &addr);