diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/socks.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 8 | ||||
| -rw-r--r-- | lib/urldata.h | 3 |
3 files changed, 1 insertions, 12 deletions
diff --git a/lib/socks.c b/lib/socks.c index 90ec1f215..693daffe3 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -390,7 +390,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, curl_socket_t sock = conn->sock[sockindex]; struct SessionHandle *data = conn->data; long timeout; - bool socks5_resolve_local = data->set.socks5_resolve_local; + bool socks5_resolve_local = data->set.proxytype == CURLPROXY_SOCKS5; const size_t hostname_len = strlen(hostname); int packetsize = 0; @@ -2054,14 +2054,6 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, } break; - case CURLOPT_SOCKS5_RESOLVE_LOCAL: - /* - * Enable or disable using of SOCKS5 proxy server to resolve domain names - * instead of using platform API like gethostbyname_r etc - */ - data->set.socks5_resolve_local = (bool)(0 != va_arg(param, long)); - break; - default: /* unknown tag and its companion, just ignore: */ result = CURLE_FAILED_INIT; /* correct this */ diff --git a/lib/urldata.h b/lib/urldata.h index 2f061e035..5b5c014b4 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1441,9 +1441,6 @@ struct UserDefined { long new_directory_perms; /* Permissions to use when creating remote dirs */ bool proxy_transfer_mode; /* set transfer mode (;type=<a|i>) when doing FTP via an HTTP proxy */ - bool socks5_resolve_local; /* resolve host names locally even if a SOCKS5 - proxy in use. Valid only if CURLOPT_PROXYTYPE - == CURLPROXY_SOCKS5, otherwise ignored. */ char *str[STRING_LAST]; /* array of strings, pointing to allocated memory */ }; |