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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 293063013: Now that the HttpStreamFactoryImpl::Job is not marking Alternate-Protocol (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comments Created 6 years, 7 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 | « no previous file | net/quic/quic_network_transaction_unittest.cc » ('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.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));
}
« no previous file with comments | « no previous file | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698