summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/http/http_network_transaction.cc57
-rw-r--r--net/proxy/proxy_server.cc15
-rw-r--r--net/proxy/proxy_server.h8
-rw-r--r--net/proxy/proxy_service.cc33
-rw-r--r--net/proxy/proxy_service.h29
5 files changed, 119 insertions, 23 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index fcad53a..ff94e30 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -929,36 +929,47 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
#if defined(SPDY_PROXY_AUTH_ORIGIN)
// Server-induced fallback; see: http://crbug.com/143712
if (response_.was_fetched_via_proxy && response_.headers.get() != NULL) {
+ ProxyService::DataReductionProxyBypassEventType proxy_bypass_event =
+ ProxyService::BYPASS_EVENT_TYPE_MAX;
base::TimeDelta bypass_duration;
bool chrome_proxy_used =
- proxy_info_.proxy_server().host_port_pair().Equals(
- HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)));
+ proxy_info_.proxy_server().isDataReductionProxy();
+ bool chrome_fallback_proxy_used = false;
#if defined(DATA_REDUCTION_FALLBACK_HOST)
if (!chrome_proxy_used) {
- chrome_proxy_used =
- proxy_info_.proxy_server().host_port_pair().Equals(
- HostPortPair::FromURL(GURL(DATA_REDUCTION_FALLBACK_HOST)));
+ chrome_fallback_proxy_used =
+ proxy_info_.proxy_server().isDataReductionProxyFallback();
}
#endif
- bool should_fallback = chrome_proxy_used &&
- response_.headers->GetChromeProxyInfo(&bypass_duration);
- // Additionally, fallback if a 500 is returned via the data reduction proxy.
- // This is conservative, as the 500 might have been generated by the origin,
- // and not the proxy.
- if (!should_fallback) {
- should_fallback = chrome_proxy_used &&
- response_.headers->response_code() == HTTP_INTERNAL_SERVER_ERROR;
- }
- if (should_fallback) {
- ProxyService* proxy_service = session_->proxy_service();
- if (proxy_service->MarkProxyAsBad(proxy_info_, bypass_duration,
- net_log_)) {
- // Only retry in the case of GETs. We don't want to resubmit a POST
- // if the proxy took some action.
- if (request_->method == "GET") {
- ResetConnectionAndRequestForResend();
- return OK;
+ if (chrome_proxy_used || chrome_fallback_proxy_used) {
+ if (response_.headers->GetChromeProxyInfo(&bypass_duration)) {
+ proxy_bypass_event =
+ (bypass_duration < base::TimeDelta::FromMinutes(30) ?
+ ProxyService::SHORT_BYPASS :
+ ProxyService::LONG_BYPASS);
+ } else {
+ // Additionally, fallback if a 500 is returned via the data reduction
+ // proxy. This is conservative, as the 500 might have been generated by
+ // the origin, and not the proxy.
+ if (response_.headers->response_code() == HTTP_INTERNAL_SERVER_ERROR)
+ proxy_bypass_event = ProxyService::INTERNAL_SERVER_ERROR_BYPASS;
+ }
+
+ if (proxy_bypass_event < ProxyService::BYPASS_EVENT_TYPE_MAX) {
+ ProxyService* proxy_service = session_->proxy_service();
+
+ proxy_service->RecordDataReductionProxyBypassInfo(
+ chrome_proxy_used, proxy_info_.proxy_server(), proxy_bypass_event);
+
+ if (proxy_service->MarkProxyAsBad(proxy_info_, bypass_duration,
+ net_log_)) {
+ // Only retry in the case of GETs. We don't want to resubmit a POST
+ // if the proxy took some action.
+ if (request_->method == "GET") {
+ ResetConnectionAndRequestForResend();
+ return OK;
+ }
}
}
}
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
index 6875b4a..3b8bd03 100644
--- a/net/proxy/proxy_server.cc
+++ b/net/proxy/proxy_server.cc
@@ -208,6 +208,21 @@ ProxyServer::Scheme ProxyServer::GetSchemeFromURI(const std::string& scheme) {
return GetSchemeFromURIInternal(scheme.begin(), scheme.end());
}
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ bool ProxyServer::isDataReductionProxy() const {
+ return host_port_pair_.Equals(
+ HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)));
+ }
+
+ bool ProxyServer::isDataReductionProxyFallback() const {
+#if defined(DATA_REDUCTION_FALLBACK_HOST)
+ return host_port_pair_.Equals(
+ HostPortPair::FromURL(GURL(DATA_REDUCTION_FALLBACK_HOST)));
+#endif // defined(DATA_REDUCTION_FALLBACK_HOST)
+ return false;
+ }
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
+
// static
ProxyServer ProxyServer::FromSchemeHostAndPort(
Scheme scheme,
diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h
index 00cc9fd..08a20c0 100644
--- a/net/proxy/proxy_server.h
+++ b/net/proxy/proxy_server.h
@@ -146,6 +146,14 @@ class NET_EXPORT ProxyServer {
return host_port_pair_ < other.host_port_pair_;
}
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ // Returns true if this proxy server is the data reduction proxy or its
+ // fallback, respectively, as configured in gyp. These functions will return
+ // false for data reduction proxy servers specified on the command line.
+ bool isDataReductionProxy() const;
+ bool isDataReductionProxyFallback() const;
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
+
private:
// Creates a ProxyServer given a scheme, and host/port string. If parsing the
// host/port string fails, the returned instance will be invalid.
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 4f9c8be..b18b47b 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -45,6 +45,10 @@
#include "net/proxy/proxy_config_service_android.h"
#endif
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+#include "base/metrics/histogram.h"
+#endif
+
using base::TimeDelta;
using base::TimeTicks;
@@ -1169,6 +1173,16 @@ int ProxyService::ReconsiderProxyAfterError(const GURL& url,
return ResolveProxy(url, result, callback, pac_request, net_log);
}
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ if (result->proxy_server().isDataReductionProxy()) {
+ RecordDataReductionProxyBypassInfo(
+ true, result->proxy_server(), ERROR_BYPASS);
+ } else if (result->proxy_server().isDataReductionProxyFallback()) {
+ RecordDataReductionProxyBypassInfo(
+ false, result->proxy_server(), ERROR_BYPASS);
+ }
+#endif
+
// We don't have new proxy settings to try, try to fallback to the next proxy
// in the list.
bool did_fallback = result->Fallback(net_log);
@@ -1393,6 +1407,25 @@ scoped_ptr<ProxyService::PacPollPolicy>
return scoped_ptr<PacPollPolicy>(new DefaultPollPolicy());
}
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+void ProxyService::RecordDataReductionProxyBypassInfo(
+ bool is_primary,
+ const ProxyServer& proxy_server,
+ DataReductionProxyBypassEventType bypass_type) const {
+ // Only record UMA if the proxy isn't already on the retry list.
+ if (proxy_retry_info_.find(proxy_server.ToURI()) != proxy_retry_info_.end())
+ return;
+
+ if (is_primary) {
+ UMA_HISTOGRAM_ENUMERATION("DataReductionProxy.BypassInfoPrimary",
+ bypass_type, BYPASS_EVENT_TYPE_MAX);
+ } else {
+ UMA_HISTOGRAM_ENUMERATION("DataReductionProxy.BypassInfoFallback",
+ bypass_type, BYPASS_EVENT_TYPE_MAX);
+ }
+}
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
+
void ProxyService::OnProxyConfigChanged(
const ProxyConfig& config,
ProxyConfigService::ConfigAvailability availability) {
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 7e4e306..3573711 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -261,6 +261,35 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// of the default internal PacPollPolicy used by ProxyService.
static scoped_ptr<PacPollPolicy> CreateDefaultPacPollPolicy();
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ // Values of the UMA DataReductionProxy.BypassInfo{Primary|Fallback}
+ // histograms. This enum must remain synchronized with the enum of the same
+ // name in metrics/histograms/histograms.xml.
+ enum DataReductionProxyBypassEventType {
+ // Bypass the proxy for less than 30 minutes.
+ SHORT_BYPASS = 0,
+
+ // Bypass the proxy for 30 minutes or more.
+ LONG_BYPASS,
+
+ // Bypass the proxy because of an internal server error.
+ INTERNAL_SERVER_ERROR_BYPASS,
+
+ // Bypass the proxy because of any other error.
+ ERROR_BYPASS,
+
+ // This must always be last.
+ BYPASS_EVENT_TYPE_MAX
+ };
+
+ // Records a |DataReductionProxyBypassEventType| for either the data reduction
+ // proxy (|is_primary| is true) or the data reduction proxy fallback.
+ void RecordDataReductionProxyBypassInfo(
+ bool is_primary,
+ const ProxyServer& proxy_server,
+ DataReductionProxyBypassEventType bypass_type) const;
+#endif
+
private:
FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigAfterFailedAutodetect);
FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigFromPACToDirect);
generated by cgit v1.1 at 2024-11-01 06:35:47 +0000