Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: net/proxy/proxy_list.h

Issue 10987043: Receiving Connection: Proxy-Bypass induces proxy fallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build fix for android_dbg. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/proxy/proxy_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_list.h
diff --git a/net/proxy/proxy_list.h b/net/proxy/proxy_list.h
index 045b7b4503c856c24272199dfef5b733978bcc81..209dd678232ba645fa92baf177cfd24abdcb694b 100644
--- a/net/proxy/proxy_list.h
+++ b/net/proxy/proxy_list.h
@@ -35,6 +35,10 @@ class NET_EXPORT_PRIVATE ProxyList {
// them to the end of the fallback list.
void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info);
+ // Returns true if this proxy list contains at least one proxy that is
+ // not currently present in |proxy_retry_info|.
+ bool HasUntriedProxies(const ProxyRetryInfoMap& proxy_retry_info) const;
+
// Delete any entry which doesn't have one of the specified proxy schemes.
// |scheme_bit_field| is a bunch of ProxyServer::Scheme bitwise ORed together.
void RemoveProxiesWithoutScheme(int scheme_bit_field);
@@ -70,6 +74,12 @@ class NET_EXPORT_PRIVATE ProxyList {
bool Fallback(ProxyRetryInfoMap* proxy_retry_info,
const BoundNetLog& net_log);
+ // Updates |proxy_retry_info| to indicate that the first proxy in the list
+ // is bad. This is distinct from Fallback(), above, to allow updating proxy
+ // retry information without modifying a given transction's proxy list.
+ void UpdateRetryInfoOnFallback(ProxyRetryInfoMap* proxy_retry_info,
+ const BoundNetLog& net_log) const;
+
private:
// List of proxies.
std::vector<ProxyServer> proxies_;
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/proxy/proxy_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698