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

Side by Side Diff: net/proxy/proxy_info.h

Issue 10987043: Receiving Connection: Proxy-Bypass induces proxy fallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pull proxy list mutation in ProxyService. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/proxy/proxy_info.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_PROXY_PROXY_INFO_H_ 5 #ifndef NET_PROXY_PROXY_INFO_H_
6 #define NET_PROXY_PROXY_INFO_H_ 6 #define NET_PROXY_PROXY_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "net/base/net_export.h" 10 #include "net/base/net_export.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 // Returns the source for configuration settings used for proxy resolution. 103 // Returns the source for configuration settings used for proxy resolution.
104 ProxyConfigSource config_source() const { return config_source_; } 104 ProxyConfigSource config_source() const { return config_source_; }
105 105
106 // See description in ProxyList::ToPacString(). 106 // See description in ProxyList::ToPacString().
107 std::string ToPacString() const; 107 std::string ToPacString() const;
108 108
109 // Marks the current proxy as bad. Returns true if there is another proxy 109 // Marks the current proxy as bad. Returns true if there is another proxy
110 // available to try in proxy list_. 110 // available to try in proxy list_.
111 bool Fallback(const BoundNetLog& net_log); 111 bool Fallback(const BoundNetLog& net_log);
112 112
113 // Marks the current proxy as bad and records the addition in the given
114 // |proxy_retry_info|.
115 bool Fallback(ProxyRetryInfoMap& proxy_retry_info,
eroman 2012/09/26 22:01:58 Our style is to use pointers for mutable state --
Michael Piatek 2012/09/27 00:30:24 Done.
116 const BoundNetLog& net_log);
117
113 // De-prioritizes the proxies that we have cached as not working, by moving 118 // De-prioritizes the proxies that we have cached as not working, by moving
114 // them to the end of the proxy list. 119 // them to the end of the proxy list.
115 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info); 120 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info);
116 121
117 // Deletes any entry which doesn't have one of the specified proxy schemes. 122 // Deletes any entry which doesn't have one of the specified proxy schemes.
118 void RemoveProxiesWithoutScheme(int scheme_bit_field); 123 void RemoveProxiesWithoutScheme(int scheme_bit_field);
119 124
120 private: 125 private:
121 friend class ProxyService; 126 friend class ProxyService;
122 127
(...skipping 20 matching lines...) Expand all
143 // Whether the proxy result represent a proxy bypass. 148 // Whether the proxy result represent a proxy bypass.
144 bool did_bypass_proxy_; 149 bool did_bypass_proxy_;
145 150
146 // Whether we used a PAC script for resolving the proxy. 151 // Whether we used a PAC script for resolving the proxy.
147 bool did_use_pac_script_; 152 bool did_use_pac_script_;
148 }; 153 };
149 154
150 } // namespace net 155 } // namespace net
151 156
152 #endif // NET_PROXY_PROXY_INFO_H_ 157 #endif // NET_PROXY_PROXY_INFO_H_
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/proxy/proxy_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698