diff options
| author | Michael Kaufmann <mail@michael-kaufmann.ch> | 2017-02-18 13:56:56 +0100 |
|---|---|---|
| committer | Michael Kaufmann <mail@michael-kaufmann.ch> | 2017-02-18 15:04:43 +0100 |
| commit | 2f8d0df085519351dbd7123178895ba910d756c1 (patch) | |
| tree | 1ec8c16fb218c3dcf26e90d183eb7aad5fecebc2 /lib/urldata.h | |
| parent | 13e3a18b345af1a15b892b0bbedfbbff06e10a39 (diff) | |
proxy: fix hostname resolution and IDN conversion
Properly resolve, convert and log the proxy host names.
Support the "--connect-to" feature for SOCKS proxies and for passive FTP
data transfers.
Follow-up to cb4e2be
Reported-by: Jay Satiro
Fixes https://github.com/curl/curl/issues/1248
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index e37b566a5..c17e42cc0 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -936,7 +936,6 @@ struct connectdata { char *secondaryhostname; /* secondary socket host name (ftp) */ struct hostname conn_to_host; /* the host to connect to. valid only if bits.conn_to_host is set */ - struct hostname proxy; struct proxy_info socks_proxy; struct proxy_info http_proxy; @@ -1644,7 +1643,6 @@ struct UserDefined { struct ssl_config_data proxy_ssl; /* user defined SSL stuff for proxy */ struct ssl_general_config general_ssl; /* general user defined SSL stuff */ curl_proxytype proxytype; /* what kind of proxy that is in use */ - curl_proxytype socks_proxytype; /* what kind of socks proxy that is in use */ long dns_cache_timeout; /* DNS cache timeout */ long buffer_size; /* size of receive buffer to use */ void *private_data; /* application-private data */ |