diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 19:13:36 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 19:13:36 +0000 |
| commit | 6be52b9d4c99cba44fde417cff215018d1dad9db (patch) | |
| tree | 0eddab971839fcf8d06c997896a6cb5216b1be4e /chrome/app | |
| parent | b27f1620e996e18ecdc424e224a6763286a040ae (diff) | |
| download | chromium_src-6be52b9d4c99cba44fde417cff215018d1dad9db.zip chromium_src-6be52b9d4c99cba44fde417cff215018d1dad9db.tar.gz chromium_src-6be52b9d4c99cba44fde417cff215018d1dad9db.tar.bz2 | |
Change the meaning of the command-line flag --proxy-server="socks://foo" to imply a SOCKS v5 proxy server rather than a SOCKS v4 proxy server.
BUG=56831
Review URL: http://codereview.chromium.org/3388021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/resources/manpage.1.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/app/resources/manpage.1.in b/chrome/app/resources/manpage.1.in index e74d5a4..fbb86ab 100644 --- a/chrome/app/resources/manpage.1.in +++ b/chrome/app/resources/manpage.1.in @@ -48,19 +48,22 @@ Where <proxy-scheme> is the protocol of the proxy server, and is one of: "http", "socks", "socks4", "socks5". If the <proxy-scheme> is omitted, it defaults to "http". Also note that -"socks" is equivlent to "socks4". +"socks" is equivalent to "socks5". Examples: --proxy-server="foopy:99" Use the HTTP proxy "foopy:99" to load all URLs. - --proxy-server="socks5://foobar:66" - Use the SOCKS v5 proxy "foobar:66" to load all URLs. - --proxy-server="socks://foobar:1080" + Use the SOCKS v5 proxy "foobar:1080" to load all URLs. + + --proxy-server="sock4://foobar:1080" Use the SOCKS v4 proxy "foobar:1080" to load all URLs. + --proxy-server="socks5://foobar:66" + Use the SOCKS v5 proxy "foobar:66" to load all URLs. + It is also possible to specify a separate proxy server for different URL types, by prefixing the proxy server specifier with a URL specifier: |