summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 00:24:37 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 00:24:37 +0000
commitf209dba88c91b0461dc5acd02af0b3685213938c (patch)
tree00fd853220b8ad787dc9134f7494da1b8c30af6f /net/socket_stream
parenta784b84a86ec0103b9af04772b573a91684a8a73 (diff)
downloadchromium_src-f209dba88c91b0461dc5acd02af0b3685213938c.zip
chromium_src-f209dba88c91b0461dc5acd02af0b3685213938c.tar.gz
chromium_src-f209dba88c91b0461dc5acd02af0b3685213938c.tar.bz2
When talking to a SOCKS v5 proxy, default to sending addresses as raw domains rather than IP addresses.
Before, we would default to client-side DNS resolution (sending IP addresses to the proxy) for both v4 and v5. However if you are using a v5 server, it is most likely that you want to do the resolves on the proxy-side. And in fact if you are using a SOCKS 5 proxy to anonymize your browsing, you definitely don't want that as the default policy. Embedders of the network stack can select the alternate policy by passing a non-NULL Host resolver into SOCKS5ClientSocket. BUG=29914 TEST=HttpNetworkTransactionTest.SOCKS5_HTTP_GET, HttpNetworkTransactionTest.SOCKS5_SSL_GET Review URL: http://codereview.chromium.org/507033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index f232c61..e746022 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -704,7 +704,7 @@ int SocketStream::DoSOCKSConnect() {
url_.EffectiveIntPort());
if (proxy_info_.proxy_server().scheme() == ProxyServer::SCHEME_SOCKS5)
- s = new SOCKS5ClientSocket(s, req_info, host_resolver_.get());
+ s = new SOCKS5ClientSocket(s, req_info, NULL /*use proxy-side resolving*/);
else
s = new SOCKSClientSocket(s, req_info, host_resolver_.get());
socket_.reset(s);