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 6a8110e23df04ab9470c5423347b48de0663110a..b3edeafc28bcfc2d41f0a50640f0880b07cbd290 100644 |
--- a/net/http/http_stream_factory_impl_job.cc |
+++ b/net/http/http_stream_factory_impl_job.cc |
@@ -989,20 +989,23 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) { |
return result; |
} |
+ if (!ssl_started && result < 0 && original_url_.get()) { |
+ job_status_ = STATUS_BROKEN; |
+ MaybeMarkAlternateProtocolBroken(); |
+ return result; |
+ } |
+ |
if (using_quic_) { |
- if (result < 0) |
+ if (result < 0) { |
+ job_status_ = STATUS_BROKEN; |
+ MaybeMarkAlternateProtocolBroken(); |
return result; |
+ } |
stream_ = quic_request_.ReleaseStream(); |
next_state_ = STATE_NONE; |
return OK; |
} |
- if (!ssl_started && result < 0 && original_url_.get()) { |
- job_status_ = STATUS_BROKEN; |
- MaybeMarkAlternateProtocolBroken(); |
- return result; |
- } |
- |
if (result < 0 && !ssl_started) |
return ReconsiderProxyAfterError(result); |
establishing_tunnel_ = false; |
@@ -1527,8 +1530,8 @@ void HttpStreamFactoryImpl::Job::MaybeMarkAlternateProtocolBroken() { |
} |
if (job_status_ == STATUS_SUCCEEDED && other_job_status_ == STATUS_BROKEN) { |
- HistogramBrokenAlternateProtocolLocation( |
- BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN); |
+ HistogramBrokenAlternateProtocolLocation( |
+ BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN); |
session_->http_server_properties()->SetBrokenAlternateProtocol( |
HostPortPair::FromURL(request_info_.url)); |
} |