diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 03:39:21 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 03:39:21 +0000 |
| commit | 20cbe23d256ad1522424a030fd109b82c7d08938 (patch) | |
| tree | 87cc08ccc272cf7a2b1b7a6b17e2b3bf7648efbd /net/socket_stream | |
| parent | 6cc5f2b193dd99f7ddc9b3d36cf15f4c028cb025 (diff) | |
| download | chromium_src-20cbe23d256ad1522424a030fd109b82c7d08938.zip chromium_src-20cbe23d256ad1522424a030fd109b82c7d08938.tar.gz chromium_src-20cbe23d256ad1522424a030fd109b82c7d08938.tar.bz2 | |
Cleanup: Remove the support for IPv4 and IPv6 addressing types in the SOCKS5 implementation.
This is no longer used by chrome, and it is unlikely that embedders would want to use this.
The default will just use the DOMAIN addressing type.
BUG=29914
Review URL: http://codereview.chromium.org/507048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index e746022..9d60a9e 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, NULL /*use proxy-side resolving*/); + s = new SOCKS5ClientSocket(s, req_info); else s = new SOCKSClientSocket(s, req_info, host_resolver_.get()); socket_.reset(s); |