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

Side by Side Diff: net/http/http_stream_factory_impl_job.cc

Issue 1768593003: When QUIC is disabled because of timeouts with open streams, re-enable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_stream_factory_impl_job.h" 5 #include "net/http/http_stream_factory_impl_job.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 if (IsSpdyAlternative() || IsQuicAlternative()) { 1719 if (IsSpdyAlternative() || IsQuicAlternative()) {
1720 if (job_status_ == STATUS_BROKEN && other_job_status_ == STATUS_SUCCEEDED) { 1720 if (job_status_ == STATUS_BROKEN && other_job_status_ == STATUS_SUCCEEDED) {
1721 HistogramBrokenAlternateProtocolLocation( 1721 HistogramBrokenAlternateProtocolLocation(
1722 BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_ALT); 1722 BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_ALT);
1723 session_->http_server_properties()->MarkAlternativeServiceBroken( 1723 session_->http_server_properties()->MarkAlternativeServiceBroken(
1724 alternative_service_); 1724 alternative_service_);
1725 } 1725 }
1726 return; 1726 return;
1727 } 1727 }
1728 1728
1729 session_->quic_stream_factory()->OnTcpJobCompleted(job_status_ ==
1730 STATUS_SUCCEEDED);
1729 if (job_status_ == STATUS_SUCCEEDED && other_job_status_ == STATUS_BROKEN) { 1731 if (job_status_ == STATUS_SUCCEEDED && other_job_status_ == STATUS_BROKEN) {
1730 HistogramBrokenAlternateProtocolLocation( 1732 HistogramBrokenAlternateProtocolLocation(
1731 BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN); 1733 BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN);
1732 session_->http_server_properties()->MarkAlternativeServiceBroken( 1734 session_->http_server_properties()->MarkAlternativeServiceBroken(
1733 other_job_alternative_service_); 1735 other_job_alternative_service_);
1734 } 1736 }
1735 } 1737 }
1736 1738
1737 HttpStreamFactoryImpl::Job::ValidSpdySessionPool::ValidSpdySessionPool( 1739 HttpStreamFactoryImpl::Job::ValidSpdySessionPool::ValidSpdySessionPool(
1738 SpdySessionPool* spdy_session_pool, 1740 SpdySessionPool* spdy_session_pool,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
1801 if (connection_->socket()) { 1803 if (connection_->socket()) {
1802 ConnectionAttempts socket_attempts; 1804 ConnectionAttempts socket_attempts;
1803 connection_->socket()->GetConnectionAttempts(&socket_attempts); 1805 connection_->socket()->GetConnectionAttempts(&socket_attempts);
1804 request_->AddConnectionAttempts(socket_attempts); 1806 request_->AddConnectionAttempts(socket_attempts);
1805 } else { 1807 } else {
1806 request_->AddConnectionAttempts(connection_->connection_attempts()); 1808 request_->AddConnectionAttempts(connection_->connection_attempts());
1807 } 1809 }
1808 } 1810 }
1809 1811
1810 } // namespace net 1812 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698