diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-12 22:10:25 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-12 22:10:25 +0000 |
| commit | 02cf5a4cb28d86669bcc4c3934f51437795b05ac (patch) | |
| tree | ebf581c062a8f469bd0dbaa18df1e37b2ad8e0b1 /net/http | |
| parent | d6fc4854834e9764dadeaf9fa826c06776d9a96e (diff) | |
| download | chromium_src-02cf5a4cb28d86669bcc4c3934f51437795b05ac.zip chromium_src-02cf5a4cb28d86669bcc4c3934f51437795b05ac.tar.gz chromium_src-02cf5a4cb28d86669bcc4c3934f51437795b05ac.tar.bz2 | |
Retry proxies which were cached as bad before giving up.
This morphs ProxyList::RemoveBadProxies() into ProxyList::DeprioritizeBadProxies(), such that "bad proxies" are moved to the end of the fallback list rather than removed alltogether.
BUG=31983
TEST=ProxyListTest.DeprioritizeBadProxies
Review URL: http://codereview.chromium.org/542029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index ea61c79..d3fed93 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -611,14 +611,9 @@ int HttpNetworkTransaction::DoResolveProxyComplete(int result) { // http://www.chromium.org/developers/design-documents/proxy-settings-fallback if (proxy_info_.is_empty()) { - // No proxies/direct to choose from. This can happen when: - // a. We don't support any of the proxies in the returned list. - // b. The proxy service returned us an empty list. - // 1. this can happen if all the proxies were marked as bad already. - // - // TODO(eroman): in case (b.1) it would be better to just try the bad - // proxies again rather than failing without having tried anything! - return ERR_EMPTY_PROXY_LIST; + // No proxies/direct to choose from. This happens when we don't support any + // of the proxies in the returned list. + return ERR_NO_SUPPORTED_PROXIES; } if (result != OK) { |