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

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

Issue 2129263002: Revert "Revert of QUIC - Race Cert Verification with host resolution if (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cronet unittest Created 4 years, 5 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/crypto/proof_verifier.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 <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 QuicCryptoClientStreamFactory::GetDefaultFactory()), 122 QuicCryptoClientStreamFactory::GetDefaultFactory()),
123 quic_max_recent_disabled_reasons(kQuicMaxRecentDisabledReasons), 123 quic_max_recent_disabled_reasons(kQuicMaxRecentDisabledReasons),
124 quic_threshold_public_resets_post_handshake(0), 124 quic_threshold_public_resets_post_handshake(0),
125 quic_threshold_timeouts_streams_open(0), 125 quic_threshold_timeouts_streams_open(0),
126 quic_close_sessions_on_ip_change(false), 126 quic_close_sessions_on_ip_change(false),
127 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 127 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
128 quic_disable_preconnect_if_0rtt(false), 128 quic_disable_preconnect_if_0rtt(false),
129 quic_migrate_sessions_on_network_change(false), 129 quic_migrate_sessions_on_network_change(false),
130 quic_migrate_sessions_early(false), 130 quic_migrate_sessions_early(false),
131 quic_disable_bidirectional_streams(false), 131 quic_disable_bidirectional_streams(false),
132 quic_race_cert_verification(false),
132 proxy_delegate(NULL), 133 proxy_delegate(NULL),
133 enable_token_binding(false) { 134 enable_token_binding(false) {
134 quic_supported_versions.push_back(QUIC_VERSION_34); 135 quic_supported_versions.push_back(QUIC_VERSION_34);
135 } 136 }
136 137
137 HttpNetworkSession::Params::Params(const Params& other) = default; 138 HttpNetworkSession::Params::Params(const Params& other) = default;
138 139
139 HttpNetworkSession::Params::~Params() {} 140 HttpNetworkSession::Params::~Params() {}
140 141
141 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 142 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 params.quic_threshold_public_resets_post_handshake, 181 params.quic_threshold_public_resets_post_handshake,
181 params.quic_threshold_timeouts_streams_open, 182 params.quic_threshold_timeouts_streams_open,
182 params.quic_socket_receive_buffer_size, 183 params.quic_socket_receive_buffer_size,
183 params.quic_delay_tcp_race, 184 params.quic_delay_tcp_race,
184 params.quic_max_server_configs_stored_in_properties, 185 params.quic_max_server_configs_stored_in_properties,
185 params.quic_close_sessions_on_ip_change, 186 params.quic_close_sessions_on_ip_change,
186 params.disable_quic_on_timeout_with_open_streams, 187 params.disable_quic_on_timeout_with_open_streams,
187 params.quic_idle_connection_timeout_seconds, 188 params.quic_idle_connection_timeout_seconds,
188 params.quic_migrate_sessions_on_network_change, 189 params.quic_migrate_sessions_on_network_change,
189 params.quic_migrate_sessions_early, 190 params.quic_migrate_sessions_early,
191 params.quic_race_cert_verification,
190 params.quic_connection_options, 192 params.quic_connection_options,
191 params.enable_token_binding), 193 params.enable_token_binding),
192 spdy_session_pool_(params.host_resolver, 194 spdy_session_pool_(params.host_resolver,
193 params.ssl_config_service, 195 params.ssl_config_service,
194 params.http_server_properties, 196 params.http_server_properties,
195 params.transport_security_state, 197 params.transport_security_state,
196 params.enable_spdy_ping_based_connection_checking, 198 params.enable_spdy_ping_based_connection_checking,
197 params.enable_priority_dependencies, 199 params.enable_priority_dependencies,
198 params.spdy_default_protocol, 200 params.spdy_default_protocol,
199 params.spdy_session_max_recv_window_size, 201 params.spdy_session_max_recv_window_size,
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 dict->SetInteger("max_server_configs_stored_in_properties", 340 dict->SetInteger("max_server_configs_stored_in_properties",
339 params_.quic_max_server_configs_stored_in_properties); 341 params_.quic_max_server_configs_stored_in_properties);
340 dict->SetInteger("idle_connection_timeout_seconds", 342 dict->SetInteger("idle_connection_timeout_seconds",
341 params_.quic_idle_connection_timeout_seconds); 343 params_.quic_idle_connection_timeout_seconds);
342 dict->SetBoolean("disable_preconnect_if_0rtt", 344 dict->SetBoolean("disable_preconnect_if_0rtt",
343 params_.quic_disable_preconnect_if_0rtt); 345 params_.quic_disable_preconnect_if_0rtt);
344 dict->SetBoolean("disable_quic_on_timeout_with_open_streams", 346 dict->SetBoolean("disable_quic_on_timeout_with_open_streams",
345 params_.disable_quic_on_timeout_with_open_streams); 347 params_.disable_quic_on_timeout_with_open_streams);
346 dict->SetString("disabled_reason", 348 dict->SetString("disabled_reason",
347 quic_stream_factory_.QuicDisabledReasonString()); 349 quic_stream_factory_.QuicDisabledReasonString());
350 dict->SetBoolean("race_cert_verification",
351 params_.quic_race_cert_verification);
348 return std::move(dict); 352 return std::move(dict);
349 } 353 }
350 354
351 void HttpNetworkSession::CloseAllConnections() { 355 void HttpNetworkSession::CloseAllConnections() {
352 normal_socket_pool_manager_->FlushSocketPoolsWithError(ERR_ABORTED); 356 normal_socket_pool_manager_->FlushSocketPoolsWithError(ERR_ABORTED);
353 websocket_socket_pool_manager_->FlushSocketPoolsWithError(ERR_ABORTED); 357 websocket_socket_pool_manager_->FlushSocketPoolsWithError(ERR_ABORTED);
354 spdy_session_pool_.CloseCurrentSessions(ERR_ABORTED); 358 spdy_session_pool_.CloseCurrentSessions(ERR_ABORTED);
355 quic_stream_factory_.CloseAllSessions(ERR_ABORTED, QUIC_INTERNAL_ERROR); 359 quic_stream_factory_.CloseAllSessions(ERR_ABORTED, QUIC_INTERNAL_ERROR);
356 } 360 }
357 361
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 case WEBSOCKET_SOCKET_POOL: 405 case WEBSOCKET_SOCKET_POOL:
402 return websocket_socket_pool_manager_.get(); 406 return websocket_socket_pool_manager_.get();
403 default: 407 default:
404 NOTREACHED(); 408 NOTREACHED();
405 break; 409 break;
406 } 410 }
407 return NULL; 411 return NULL;
408 } 412 }
409 413
410 } // namespace net 414 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.h ('k') | net/quic/crypto/proof_verifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698