diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 22:20:22 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 22:20:22 +0000 |
| commit | 0603139039825ae34f1c9f659827eb78dada2728 (patch) | |
| tree | c49a2a98a493cedca91e72fbb9d4e71b07b8c6df /net/proxy/proxy_server.cc | |
| parent | 2ba1c6cfc414c52b3798e18de01ecf24ae8c5e59 (diff) | |
| download | chromium_src-0603139039825ae34f1c9f659827eb78dada2728.zip chromium_src-0603139039825ae34f1c9f659827eb78dada2728.tar.gz chromium_src-0603139039825ae34f1c9f659827eb78dada2728.tar.bz2 | |
Include entries for SOCKS in ProxyResolverMac.
Review URL: http://codereview.chromium.org/20489
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_server.cc')
| -rw-r--r-- | net/proxy/proxy_server.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc index a2d1e76..3ff5432 100644 --- a/net/proxy/proxy_server.cc +++ b/net/proxy/proxy_server.cc @@ -15,20 +15,6 @@ namespace net { namespace { -// Returns the default port number for proxy server with the -// specified scheme. Returns -1 if unknown. -int GetDefaultPortForScheme(ProxyServer::Scheme scheme) { - switch (scheme) { - case ProxyServer::SCHEME_HTTP: - return 80; - case ProxyServer::SCHEME_SOCKS4: - case ProxyServer::SCHEME_SOCKS5: - return 1080; - default: - return -1; - } -} - // Parse the proxy type from a PAC string, to a ProxyServer::Scheme. // This mapping is case-insensitive. If no type could be matched // returns SCHEME_INVALID. @@ -185,6 +171,19 @@ std::string ProxyServer::ToPacString() const { } // static +int ProxyServer::GetDefaultPortForScheme(Scheme scheme) { + switch (scheme) { + case SCHEME_HTTP: + return 80; + case SCHEME_SOCKS4: + case SCHEME_SOCKS5: + return 1080; + default: + return -1; + } +} + +// static ProxyServer ProxyServer::FromSchemeHostAndPort( Scheme scheme, std::string::const_iterator begin, |