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

Unified Diff: net/http/http_stream_factory_impl_job_controller.cc

Issue 2821463002: Disable HTTP/2 Alternative Services. (Closed)
Patch Set: Revert change in histogram logic. Created 3 years, 8 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_unittest.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job_controller.cc
diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc
index ec3827716e372fb5e2cbb3acd66e36433f4114aa..772bbfe1dcbcb7fbc0ca19008e2f9f25d9e8b2c4 100644
--- a/net/http/http_stream_factory_impl_job_controller.cc
+++ b/net/http/http_stream_factory_impl_job_controller.cc
@@ -988,7 +988,6 @@ HttpStreamFactoryImpl::JobController::GetAlternativeServiceForInternal(
continue;
}
-
// Some shared unix systems may have user home directories (like
// http://foo.com/~mike) which allow users to emit headers. This is a bad
// idea already, but with Alternate-Protocol, it provides the ability for a
@@ -1002,11 +1001,8 @@ HttpStreamFactoryImpl::JobController::GetAlternativeServiceForInternal(
continue;
if (alternative_service.protocol == kProtoHTTP2) {
- if (origin.host() != alternative_service.host &&
- !session_->params()
- .enable_http2_alternative_service_with_different_host) {
+ if (!session_->params().enable_http2_alternative_service)
continue;
- }
// Cache this entry if we don't have a non-broken Alt-Svc yet.
if (first_alternative_service.protocol == kProtoUnknown)
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698