OLD | NEW |
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/quic/quic_stream_factory.h" | 5 #include "net/quic/quic_stream_factory.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1662 // If the AlternativeServiceMap contained an entry for this host, check if | 1662 // If the AlternativeServiceMap contained an entry for this host, check if |
1663 // the disk cache contained an entry for it. | 1663 // the disk cache contained an entry for it. |
1664 if (ContainsKey(quic_supported_servers_at_startup_, | 1664 if (ContainsKey(quic_supported_servers_at_startup_, |
1665 server_id.host_port_pair())) { | 1665 server_id.host_port_pair())) { |
1666 UMA_HISTOGRAM_BOOLEAN("Net.QuicServerInfo.ExpectConfigMissingFromDiskCache", | 1666 UMA_HISTOGRAM_BOOLEAN("Net.QuicServerInfo.ExpectConfigMissingFromDiskCache", |
1667 server_info->state().server_config.empty()); | 1667 server_info->state().server_config.empty()); |
1668 } | 1668 } |
1669 | 1669 |
1670 cached->Initialize(server_info->state().server_config, | 1670 cached->Initialize(server_info->state().server_config, |
1671 server_info->state().source_address_token, | 1671 server_info->state().source_address_token, |
1672 server_info->state().certs, "", "", | 1672 server_info->state().certs, server_info->state().cert_sct, |
| 1673 server_info->state().chlo_hash, |
1673 server_info->state().server_config_sig, clock_->WallNow()); | 1674 server_info->state().server_config_sig, clock_->WallNow()); |
1674 } | 1675 } |
1675 | 1676 |
1676 void QuicStreamFactory::MaybeInitialize() { | 1677 void QuicStreamFactory::MaybeInitialize() { |
1677 // We don't initialize data from HttpServerProperties in the constructor | 1678 // We don't initialize data from HttpServerProperties in the constructor |
1678 // because HttpServerProperties has not yet initialized. We're guaranteed | 1679 // because HttpServerProperties has not yet initialized. We're guaranteed |
1679 // HttpServerProperties has been initialized by the first time a request is | 1680 // HttpServerProperties has been initialized by the first time a request is |
1680 // made. | 1681 // made. |
1681 if (has_initialized_data_) | 1682 if (has_initialized_data_) |
1682 return; | 1683 return; |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1746 // Since the session was active, there's no longer an | 1747 // Since the session was active, there's no longer an |
1747 // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP | 1748 // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP |
1748 // job also fails. So to avoid not using QUIC when we otherwise could, we mark | 1749 // job also fails. So to avoid not using QUIC when we otherwise could, we mark |
1749 // it as recently broken, which means that 0-RTT will be disabled but we'll | 1750 // it as recently broken, which means that 0-RTT will be disabled but we'll |
1750 // still race. | 1751 // still race. |
1751 http_server_properties_->MarkAlternativeServiceRecentlyBroken( | 1752 http_server_properties_->MarkAlternativeServiceRecentlyBroken( |
1752 alternative_service); | 1753 alternative_service); |
1753 } | 1754 } |
1754 | 1755 |
1755 } // namespace net | 1756 } // namespace net |
OLD | NEW |