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

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

Issue 2821053004: Revert of Remove the code to store and load QUIC server configs in the disk cache. (Closed)
Patch Set: Created 3 years, 8 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 | « net/http/http_network_session.h ('k') | net/quic/chromium/properties_based_quic_server_info.h » ('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_network_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <inttypes.h> 7 #include <inttypes.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 testing_fixed_https_port(0), 116 testing_fixed_https_port(0),
117 enable_tcp_fast_open_for_ssl(false), 117 enable_tcp_fast_open_for_ssl(false),
118 enable_spdy_ping_based_connection_checking(true), 118 enable_spdy_ping_based_connection_checking(true),
119 enable_http2(true), 119 enable_http2(true),
120 spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize), 120 spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize),
121 time_func(&base::TimeTicks::Now), 121 time_func(&base::TimeTicks::Now),
122 enable_http2_alternative_service(false), 122 enable_http2_alternative_service(false),
123 enable_quic(false), 123 enable_quic(false),
124 mark_quic_broken_when_network_blackholes(false), 124 mark_quic_broken_when_network_blackholes(false),
125 retry_without_alt_svc_on_quic_errors(false), 125 retry_without_alt_svc_on_quic_errors(false),
126 quic_load_server_info_timeout_srtt_multiplier(0.25f),
127 quic_enable_connection_racing(false),
126 quic_enable_non_blocking_io(false), 128 quic_enable_non_blocking_io(false),
129 quic_disable_disk_cache(false),
127 quic_max_server_configs_stored_in_properties(0u), 130 quic_max_server_configs_stored_in_properties(0u),
128 quic_clock(nullptr), 131 quic_clock(nullptr),
129 quic_random(nullptr), 132 quic_random(nullptr),
130 quic_max_packet_length(kDefaultMaxPacketSize), 133 quic_max_packet_length(kDefaultMaxPacketSize),
131 enable_user_alternate_protocol_ports(false), 134 enable_user_alternate_protocol_ports(false),
132 quic_crypto_client_stream_factory( 135 quic_crypto_client_stream_factory(
133 QuicCryptoClientStreamFactory::GetDefaultFactory()), 136 QuicCryptoClientStreamFactory::GetDefaultFactory()),
134 quic_close_sessions_on_ip_change(false), 137 quic_close_sessions_on_ip_change(false),
135 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 138 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
136 quic_reduced_ping_timeout_seconds(kPingTimeoutSecs), 139 quic_reduced_ping_timeout_seconds(kPingTimeoutSecs),
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 params.transport_security_state, 183 params.transport_security_state,
181 params.cert_transparency_verifier, 184 params.cert_transparency_verifier,
182 params.socket_performance_watcher_factory, 185 params.socket_performance_watcher_factory,
183 params.quic_crypto_client_stream_factory, 186 params.quic_crypto_client_stream_factory,
184 params.quic_random ? params.quic_random : QuicRandom::GetInstance(), 187 params.quic_random ? params.quic_random : QuicRandom::GetInstance(),
185 params.quic_clock ? params.quic_clock 188 params.quic_clock ? params.quic_clock
186 : QuicChromiumClock::GetInstance(), 189 : QuicChromiumClock::GetInstance(),
187 params.quic_max_packet_length, 190 params.quic_max_packet_length,
188 params.quic_user_agent_id, 191 params.quic_user_agent_id,
189 params.quic_supported_versions, 192 params.quic_supported_versions,
193 params.quic_load_server_info_timeout_srtt_multiplier,
194 params.quic_enable_connection_racing,
190 params.quic_enable_non_blocking_io, 195 params.quic_enable_non_blocking_io,
191 params.quic_max_server_configs_stored_in_properties > 0, 196 params.quic_disable_disk_cache,
197 params.quic_max_server_configs_stored_in_properties,
192 params.quic_close_sessions_on_ip_change, 198 params.quic_close_sessions_on_ip_change,
193 params.mark_quic_broken_when_network_blackholes, 199 params.mark_quic_broken_when_network_blackholes,
194 params.quic_idle_connection_timeout_seconds, 200 params.quic_idle_connection_timeout_seconds,
195 params.quic_reduced_ping_timeout_seconds, 201 params.quic_reduced_ping_timeout_seconds,
196 params.quic_packet_reader_yield_after_duration_milliseconds, 202 params.quic_packet_reader_yield_after_duration_milliseconds,
197 params.quic_migrate_sessions_on_network_change, 203 params.quic_migrate_sessions_on_network_change,
198 params.quic_migrate_sessions_early, 204 params.quic_migrate_sessions_early,
199 params.quic_allow_server_migration, 205 params.quic_allow_server_migration,
200 params.quic_force_hol_blocking, 206 params.quic_force_hol_blocking,
201 params.quic_race_cert_verification, 207 params.quic_race_cert_verification,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 319 }
314 dict->Set("connection_options", std::move(connection_options)); 320 dict->Set("connection_options", std::move(connection_options));
315 321
316 std::unique_ptr<base::ListValue> origins_to_force_quic_on( 322 std::unique_ptr<base::ListValue> origins_to_force_quic_on(
317 new base::ListValue); 323 new base::ListValue);
318 for (const auto& origin : params_.origins_to_force_quic_on) { 324 for (const auto& origin : params_.origins_to_force_quic_on) {
319 origins_to_force_quic_on->AppendString("'" + origin.ToString() + "'"); 325 origins_to_force_quic_on->AppendString("'" + origin.ToString() + "'");
320 } 326 }
321 dict->Set("origins_to_force_quic_on", std::move(origins_to_force_quic_on)); 327 dict->Set("origins_to_force_quic_on", std::move(origins_to_force_quic_on));
322 328
329 dict->SetDouble("load_server_info_timeout_srtt_multiplier",
330 params_.quic_load_server_info_timeout_srtt_multiplier);
331 dict->SetBoolean("enable_connection_racing",
332 params_.quic_enable_connection_racing);
333 dict->SetBoolean("disable_disk_cache", params_.quic_disable_disk_cache);
323 dict->SetInteger("max_server_configs_stored_in_properties", 334 dict->SetInteger("max_server_configs_stored_in_properties",
324 params_.quic_max_server_configs_stored_in_properties); 335 params_.quic_max_server_configs_stored_in_properties);
325 dict->SetInteger("idle_connection_timeout_seconds", 336 dict->SetInteger("idle_connection_timeout_seconds",
326 params_.quic_idle_connection_timeout_seconds); 337 params_.quic_idle_connection_timeout_seconds);
327 dict->SetInteger("reduced_ping_timeout_seconds", 338 dict->SetInteger("reduced_ping_timeout_seconds",
328 params_.quic_reduced_ping_timeout_seconds); 339 params_.quic_reduced_ping_timeout_seconds);
329 dict->SetInteger( 340 dict->SetInteger(
330 "packet_reader_yield_after_duration_milliseconds", 341 "packet_reader_yield_after_duration_milliseconds",
331 params_.quic_packet_reader_yield_after_duration_milliseconds); 342 params_.quic_packet_reader_yield_after_duration_milliseconds);
332 dict->SetBoolean("force_hol_blocking", params_.quic_force_hol_blocking); 343 dict->SetBoolean("force_hol_blocking", params_.quic_force_hol_blocking);
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 CloseIdleConnections(); 465 CloseIdleConnections();
455 break; 466 break;
456 } 467 }
457 } 468 }
458 469
459 void HttpNetworkSession::OnPurgeMemory() { 470 void HttpNetworkSession::OnPurgeMemory() {
460 CloseIdleConnections(); 471 CloseIdleConnections();
461 } 472 }
462 473
463 } // namespace net 474 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.h ('k') | net/quic/chromium/properties_based_quic_server_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698