summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-05 20:09:21 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-05 20:09:21 +0000
commit69719063c6ddf24d63762a5519efb11dc412a3ee (patch)
treea12969e6a91c61ec66cdea7d6fd622290256cc16 /net/base
parent1515a1d6e4355ef55dc9ea9e1113d4bf0f8362c9 (diff)
downloadchromium_src-69719063c6ddf24d63762a5519efb11dc412a3ee.zip
chromium_src-69719063c6ddf24d63762a5519efb11dc412a3ee.tar.gz
chromium_src-69719063c6ddf24d63762a5519efb11dc412a3ee.tar.bz2
Remove the implicit fallback to DIRECT when proxies fail. This better matches other browsers, and simplifies the code.
To better understand what this means, here are some examples how the behaviors will differ for the user: (1) You start chrome with --proxy-server="foobar:80". The server "foobar:80" is refusing connections. Before: Would fallback to direct after failing to connect through foobar:80. Now: Will error-out with connection refused after failing to connect through foobar:80. (2) You start chrome with --proxy-pac-url="file:///foobar.pac". The server "foobar:80" is unreachable, and foobar.pac reads: function FindProxyForURL(url, host) { return "PROXY foobar:80"; } Before: Would fallback to direct after failing to connect through foobar:80. Now: Will error-out with connection refused after failing to connect through foobar:80. (3) You start chrome with --proxy-pac-url="file:///foobar.pac". The server "foobar:80" is unreachable, and foobar.pac reads: function FindProxyForURL(url, host) { return "PROXY foobar:80; DIRECT"; } *No change, since the fallback to DIRECT is explicit in the PAC script* BUG=12303 Review URL: http://codereview.chromium.org/502068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/net_error_list.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h
index 12bb3a4..9502018 100644
--- a/net/base/net_error_list.h
+++ b/net/base/net_error_list.h
@@ -288,6 +288,9 @@ NET_ERROR(UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT, -334)
// Attempted use of an unknown FLIP stream id.
NET_ERROR(INVALID_FLIP_STREAM, -335)
+// There are no supported proxies in the provided list.
+NET_ERROR(EMPTY_PROXY_LIST, -336)
+
// The cache does not have the requested entry.
NET_ERROR(CACHE_MISS, -400)