Index: net/http/http_stream_factory_impl_job.cc |
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc |
index a11dd2e99724b1d24a168d2919515cb63876b5f9..77b124364f208be36cf2129406472c3049c883a1 100644 |
--- a/net/http/http_stream_factory_impl_job.cc |
+++ b/net/http/http_stream_factory_impl_job.cc |
@@ -171,6 +171,7 @@ void HttpStreamFactoryImpl::Job::MarkAsAlternate( |
AlternateProtocolInfo alternate) { |
DCHECK(!original_url_.get()); |
original_url_.reset(new GURL(original_url)); |
+ alternate_protocol_ = alternate; |
if (alternate.protocol == QUIC) { |
DCHECK(session_->params().enable_quic); |
using_quic_ = true; |
Ryan Hamilton
2014/11/03 19:00:31
If alternate_protocol_ now contains the alternate
Bence
2014/11/03 22:32:26
I feel like we still need |using_quic_|, otherwise
Ryan Hamilton
2014/11/04 18:56:22
Makes sense.
|
@@ -1460,7 +1461,7 @@ void HttpStreamFactoryImpl::Job::MaybeMarkAlternateProtocolBroken() { |
HistogramBrokenAlternateProtocolLocation( |
BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_ALT); |
session_->http_server_properties()->SetBrokenAlternateProtocol( |
- HostPortPair::FromURL(*original_url_)); |
+ HostPortPair::FromURL(*original_url_), alternate_protocol_); |
} |
return; |
} |
@@ -1469,7 +1470,7 @@ void HttpStreamFactoryImpl::Job::MaybeMarkAlternateProtocolBroken() { |
HistogramBrokenAlternateProtocolLocation( |
BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN); |
session_->http_server_properties()->SetBrokenAlternateProtocol( |
- HostPortPair::FromURL(request_info_.url)); |
+ HostPortPair::FromURL(request_info_.url), alternate_protocol_); |
} |
} |