summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authorpiatek@google.com <piatek@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 19:51:29 +0000
committerpiatek@google.com <piatek@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 19:51:29 +0000
commit14b7e9a496852c1b869749c506d3576fcc6fcf96 (patch)
treefd541296e6d96b082b8bf5f05d30b3125cf510e2 /net/proxy/proxy_service.cc
parentf57c14b47cfde98b062f2d40679fa3d2fc88fb82 (diff)
downloadchromium_src-14b7e9a496852c1b869749c506d3576fcc6fcf96.zip
chromium_src-14b7e9a496852c1b869749c506d3576fcc6fcf96.tar.gz
chromium_src-14b7e9a496852c1b869749c506d3576fcc6fcf96.tar.bz2
Receiving Connection: Proxy-Bypass induces proxy fallback.
BUG=143712 Review URL: https://chromiumcodereview.appspot.com/10987043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 9989b82..615434b 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -1174,6 +1174,12 @@ int ProxyService::ReconsiderProxyAfterError(const GURL& url,
return did_fallback ? OK : ERR_FAILED;
}
+bool ProxyService::MarkProxyAsBad(const ProxyInfo& result,
+ const BoundNetLog& net_log) {
+ result.proxy_list_.UpdateRetryInfoOnFallback(&proxy_retry_info_, net_log);
+ return result.proxy_list_.HasUntriedProxies(proxy_retry_info_);
+}
+
void ProxyService::ReportSuccess(const ProxyInfo& result) {
DCHECK(CalledOnValidThread());